From bab6caf3e07bf21d88a5dff857f8ccc7b96e9c0e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 20 Apr 2013 15:32:19 +0200 Subject: [PATCH] Another lap of updating base packages: * binutils has now been split off gcc * adjusted other packages to new naming scheme --- build/jam/OptionalBuildFeatures | 2 +- build/jam/OptionalPackages | 37 ++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 8cbad213b8..46211c7037 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -14,7 +14,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] { if $(HAIKU_GCC_VERSION[1]) >= 4 { HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ; } else { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-3-x86_gcc2.hpkg ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-4-x86_gcc2.hpkg ; } local baseURL = http://haiku-files.org/files/optional-packages ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index be28c41153..2034927962 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -112,7 +112,7 @@ if [ IsOptionalHaikuImagePackageAdded APR ] { : : true ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/apr-1.4.2-3-x86_gcc2.hpkg + $(hpkgBaseURL)/apr-1.4.2-5-x86_gcc2.hpkg : common packages ; } } @@ -128,7 +128,7 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { : : true ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/apr-util-1.3.10-3-x86_gcc2.hpkg + $(hpkgBaseURL)/apr_util-1.3.10-4-x86_gcc2.hpkg : common packages ; } } @@ -467,13 +467,13 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { : : true ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/autoconf-2.68-3-x86_gcc2.hpkg + $(hpkgBaseURL)/autoconf-2.68-4-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/automake-1.11.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/automake-1.11.1-4-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/libtool-2.4-3-x86_gcc2.hpkg + $(hpkgBaseURL)/libtool-2.4-4-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage $(hpkgBaseURL)/texinfo-4.13a-2-x86_gcc2.hpkg @@ -488,7 +488,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] # gcc and binutils if $(HAIKU_GCC_VERSION[1]) = 2 { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/gcc-2.95.3_110711-4-x86_gcc2.hpkg + $(hpkgBaseURL)/binutils-2.17_110711-2-x86_gcc2.hpkg + : common packages ; + InstallOptionalHaikuImagePackage + $(hpkgBaseURL)/gcc-2.95.3_110711-5-x86_gcc2.hpkg : common packages ; # TODO: remove this when we have a mechanism to switch gcc via PATH @@ -521,7 +524,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] $(hpkgBaseURL)/bison-2.4.3-2-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/m4-1.4.16-3-x86_gcc2.hpkg + $(hpkgBaseURL)/m4-1.4.16-4-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage $(hpkgBaseURL)/flex-2.5.35-2-x86_gcc2.hpkg @@ -533,7 +536,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] $(hpkgBaseURL)/mkdepend-1.7-1-x86_gcc2.hpkg : common packages ; InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/make-3.82-3-x86_gcc2.hpkg + $(hpkgBaseURL)/make-3.82-4-x86_gcc2.hpkg : common packages ; } } @@ -613,7 +616,7 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] { : : true ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/expat-2.0.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/expat-2.0.1-4-x86_gcc2.hpkg : common packages ; } } @@ -809,7 +812,7 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] { $(baseURL)/libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/libiconv-1.13.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/libiconv-1.13.1-4-x86_gcc2.hpkg : common packages ; } } @@ -865,7 +868,7 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] { $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/libxml2-2.7.8-3-x86_gcc2.hpkg + $(hpkgBaseURL)/libxml2-2.7.8-4-x86_gcc2.hpkg : common packages ; } } @@ -985,7 +988,7 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] { $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/neon-0.29.6-3-x86_gcc2.hpkg + $(hpkgBaseURL)/neon-0.29.6-4-x86_gcc2.hpkg : common packages ; } } @@ -1194,7 +1197,7 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] { : : true ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/perl-5.10.1-3-x86_gcc2.hpkg + $(hpkgBaseURL)/perl-5.10.1-4-x86_gcc2.hpkg : common packages ; } } @@ -1260,7 +1263,7 @@ if [ IsOptionalHaikuImagePackageAdded Sed ] { $(baseURL)/sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/sed-4.2.1-2-x86_gcc2.hpkg + $(hpkgBaseURL)/sed-4.2.1-3-x86_gcc2.hpkg : common packages ; } } @@ -1276,7 +1279,7 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/sqlite-3.7.5-4-x86_gcc2.hpkg + $(hpkgBaseURL)/sqlite-3.7.5-5-x86_gcc2.hpkg : common packages ; } } @@ -1294,7 +1297,7 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { : : true ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/subversion-1.6.15-3-x86_gcc2.hpkg + $(hpkgBaseURL)/subversion-1.6.15-4-x86_gcc2.hpkg : common packages ; } } @@ -1325,7 +1328,7 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] { $(baseURL)/tar-1.25-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage - $(hpkgBaseURL)/tar-1.26-2-x86_gcc2.hpkg + $(hpkgBaseURL)/tar-1.26-3-x86_gcc2.hpkg : common packages ; } }