From 5c31e9b97f45b4fab2d352579bc1d7ab71b9d6f5 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 17 Aug 2009 19:27:30 +0000 Subject: [PATCH] * added new optional package for gcc4 and flex, both of which no longer require libiconv * removed libiconv from dependencies of DevelopmentMin, as this is no longer true git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32479 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackageDependencies | 1 - build/jam/OptionalPackages | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index 54371466d0..b695e5c5c5 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -8,7 +8,6 @@ OptionalPackageDependencies APR-util : APR ; OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; -OptionalPackageDependencies DevelopmentMin : LibIconv ; OptionalPackageDependencies Firefox : LibIconv ; OptionalPackageDependencies LibLayout : DevelopmentBase ; OptionalPackageDependencies NetSurf : OpenSSL ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 82876e3e05..631aba5d4b 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -274,8 +274,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] } if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) { - InstallOptionalHaikuImagePackage gcc-4.3.3-x86-gcc4-2009-06-29-1 - : $(baseURL)/gcc-4.3.3-x86-gcc4-2009-06-29-1.zip ; + InstallOptionalHaikuImagePackage gcc-4.3.3-x86-gcc4-2009-06-29-2 + : $(baseURL)/gcc-4.3.3-x86-gcc4-2009-06-29-2.zip ; # symlink cpp to g++'s headers AddSymlinkToHaikuImage develop abi x86 gcc4 headers @@ -287,8 +287,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] : $(baseURL)/bison-2.4.1-x86-gcc2-2009-07-05.zip ; InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04 : $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip ; - InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc2-2009-07-05 - : $(baseURL)/flex-2.5.35-x86-gcc2-2009-07-05.zip ; + InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc2-2009-08-17 + : $(baseURL)/flex-2.5.35-x86-gcc2-2009-08-17.zip ; InstallOptionalHaikuImagePackage jam-2.5-x86-gcc2-2009-05-26 : $(baseURL)/jam-2.5-x86-gcc2-2009-05-26.zip ;