From 1c433de84c6fe632689731a46038d803cc2cfce9 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 8 Feb 2009 12:40:16 +0000 Subject: [PATCH] * Always install the "other tools" as part of the development optional package. These all work on pure GCC4 images as well because they do not use any of our C++ APIs. * Remove the GCC4 package from hybrid installs though, as it's not usable without proper setup. Also the trick with rewriting the symlink obviously doesn't work because symlinks are done way earlier than unzipping the optional packages when building the image. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29158 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 78 +++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 07cb50360c..80ce827371 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -230,57 +230,49 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { : $(baseURL)/gcc-2.95.3-haiku-081024.zip : ; - # other tools - InstallOptionalHaikuImagePackage autoconf-2.63-gcc2-2008-11-05 - : $(baseURL)/autoconf-2.63-gcc2-2008-11-05.zip - : - ; - InstallOptionalHaikuImagePackage automake-1.10.1-gcc2-2008-11-06 - : $(baseURL)/automake-1.10.1-gcc2-2008-11-06.zip - : - ; - InstallOptionalHaikuImagePackage bison-2.4-gcc2-2008-11-09 - : $(baseURL)/bison-2.4-gcc2-2008-11-09.zip - : - ; - InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-2008-11-09 - : $(baseURL)/flex-2.5.35-gcc2-2008-11-09.zip - : - ; - InstallOptionalHaikuImagePackage jam-haiku-gcc2-2008-03-27-2 - : $(baseURL)/jam-haiku-gcc2-2008-03-27-2.zip - : - ; - InstallOptionalHaikuImagePackage libtool-2.2.6a-gcc2-2008-11-09 - : $(baseURL)/libtool-2.2.6a-gcc2-2008-11-09.zip - : - ; - InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04 - : $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip - : - ; - InstallOptionalHaikuImagePackage texinfo-4.13a-gcc2-2008-11-09 - : $(baseURL)/texinfo-4.13a-gcc2-2008-11-09.zip - : - ; } - if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) = 1 { + # other tools + InstallOptionalHaikuImagePackage autoconf-2.63-gcc2-2008-11-05 + : $(baseURL)/autoconf-2.63-gcc2-2008-11-05.zip + : + ; + InstallOptionalHaikuImagePackage automake-1.10.1-gcc2-2008-11-06 + : $(baseURL)/automake-1.10.1-gcc2-2008-11-06.zip + : + ; + InstallOptionalHaikuImagePackage bison-2.4-gcc2-2008-11-09 + : $(baseURL)/bison-2.4-gcc2-2008-11-09.zip + : + ; + InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-2008-11-09 + : $(baseURL)/flex-2.5.35-gcc2-2008-11-09.zip + : + ; + InstallOptionalHaikuImagePackage jam-haiku-gcc2-2008-03-27-2 + : $(baseURL)/jam-haiku-gcc2-2008-03-27-2.zip + : + ; + InstallOptionalHaikuImagePackage libtool-2.2.6a-gcc2-2008-11-09 + : $(baseURL)/libtool-2.2.6a-gcc2-2008-11-09.zip + : + ; + InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04 + : $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip + : + ; + InstallOptionalHaikuImagePackage texinfo-4.13a-gcc2-2008-11-09 + : $(baseURL)/texinfo-4.13a-gcc2-2008-11-09.zip + : + ; + + if $(HAIKU_GCC_VERSION[1]) = 4 { # gcc and binutils local baseURL = http://haiku.mlotz.ch ; InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090129 : $(baseURL)/gcc-4.3.3-haiku-090129.zip : ; - - # Setup the proper gnupro symlink. Both packages provide one and on - # a GCC2 based hybrid the GCC4 package will overwrite the one present. - # Since we want to use GCC2 as the host compiler on a GCC2 base we have - # to correct this again. - if $(HAIKU_GCC_VERSION[1]) = 2 { - AddSymlinkToHaikuImage develop tools - : /boot/develop/tools/gcc-2.95.3-haiku-081024 : gnupro ; - } } }