From 09908323b53c43891a29cc248a8c43cf834ab9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Fri, 27 Mar 2009 11:32:09 +0000 Subject: [PATCH] Patch by aljen: Added GCC4 Pe package. Two notes by myself: * I've changed the patch to remove code duplication. This is always preferable. * GCC4 packages may break, because Haiku does not claim to keep binary compatibility with itself until after the R1 release. Even then we may not keep it for GCC4, since Haiku will most likely be GCC2, and there will be a real GCC4 switch where we will try to make API changes that will be supported in future releases. So GCC4 packages should be considered very carefully. In the case of Pe, there may be the benefit of faster launch times, since most libs will be already loaded (unlike if it's a GCC2 package on a GCC4 Haiku). I am just saying the benefits need to outweight the additional work to maintain and test these packages. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29744 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 9fd0816fb5..18df6c095d 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -454,13 +454,19 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] { if [ IsOptionalHaikuImagePackageAdded Pe ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Pe available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 { - Echo "No optional package Pe available for gcc4" ; } else { - InstallOptionalHaikuImagePackage pe-2.4.1-x86-rc3-gcc2-2009-03-07 - : http://haiku-files.org/files/optional-packages/pe-2.4.1-x86-rc3-gcc2-2009-03-07.zip - : apps - ; + local baseURL = http://haiku-files.org/files/optional-packages ; + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage pe-2.4.1-x86-rc3-gcc4-2009-03-27 + : $(baseURL)/pe-2.4.1-x86-rc3-gcc4-2009-03-27.zip + : apps + ; + } else { + InstallOptionalHaikuImagePackage pe-2.4.1-x86-rc3-gcc2-2009-03-07 + : $(baseURL)/pe-2.4.1-x86-rc3-gcc2-2009-03-07.zip + : apps + ; + } AddSymlinkToHaikuImage home config be Applications : /boot/apps/Pe/Pe ;