From f432cc5ef2edcf4f00c86b44251f35cc56b90658 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 May 2011 22:52:01 +0000 Subject: [PATCH] First wave of gcc4 built OptionalPackages for alpha3. +alpha3 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41613 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalBuildFeatures | 2 +- build/jam/OptionalPackages | 40 ++++++++++++++++----------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 60ac4128e1..aefaff1a63 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -12,7 +12,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] { } if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-x86-gcc4-2011-05-10.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-20.zip ; } else { HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc2-2011-05-17.zip ; } diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 5e910587eb..d946f9257f 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -477,14 +477,14 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { # autotools if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage autoconf-2.68-x86-gcc4-2011-03-14.zip - : $(baseURL)/autoconf-2.68-x86-gcc4-2011-03-14.zip + InstallOptionalHaikuImagePackage autoconf-2.68-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-20.zip : : true ; - InstallOptionalHaikuImagePackage automake-1.11.1-x86-gcc4-2011-03-14.zip - : $(baseURL)/automake-1.11.1-x86-gcc4-2011-03-14.zip + InstallOptionalHaikuImagePackage automake-1.11.1-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-20.zip : : true ; - InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc4-2011-03-14.zip - : $(baseURL)/libtool-2.4-x86-gcc4-2011-03-14.zip + InstallOptionalHaikuImagePackage libtool-2.4-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-20.zip : : true ; InstallOptionalHaikuImagePackage texinfo-4.13a-x86-gcc4-2011-03-14.zip : $(baseURL)/texinfo-4.13a-x86-gcc4-2011-03-14.zip @@ -547,19 +547,19 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] # other commonly used tools if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - bison-2.4.3-x86-gcc4-2011-03-14.zip - : $(baseURL)/bison-2.4.3-x86-gcc4-2011-03-14.zip ; + bison-2.4.3-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/bison-2.4.3-r1a3-x86-gcc4-2011-05-20.zip ; InstallOptionalHaikuImagePackage - m4-1.4.16-x86-gcc4-2011-03-14.zip - : $(baseURL)/m4-1.4.16-x86-gcc4-2011-03-14.zip ; - InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc4-2011-03-14.zip - : $(baseURL)/flex-2.5.35-x86-gcc4-2011-03-14.zip ; - InstallOptionalHaikuImagePackage jam-2.5-x86-gcc4-2010-11-12.zip - : $(baseURL)/jam-2.5-x86-gcc4-2010-11-12.zip ; - InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc4-2010-11-12.zip - : $(baseURL)/mkdepend-1.7-x86-gcc4-2010-11-12.zip ; - InstallOptionalHaikuImagePackage make-3.82-x86-gcc4-2011-03-15.zip - : $(baseURL)/make-3.82-x86-gcc4-2011-03-15.zip ; + m4-1.4.16-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/m4-1.4.16-r1a3-x86-gcc4-2011-05-20.zip ; + InstallOptionalHaikuImagePackage flex-2.5.35-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/flex-2.5.35-r1a3-x86-gcc4-2011-05-20.zip ; + InstallOptionalHaikuImagePackage jam-2.5-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/jam-2.5-r1a3-x86-gcc4-2011-05-20.zip ; + InstallOptionalHaikuImagePackage mkdepend-1.7-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc4-2011-05-20.zip ; + InstallOptionalHaikuImagePackage make-3.82-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-20.zip ; } else { InstallOptionalHaikuImagePackage bison-2.4.3-r1a3-x86-gcc2-2011-05-17.zip @@ -1761,8 +1761,8 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] { Echo "No optional package Yasm available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - yasm-1.1.0-x86-gcc4-2011-05-14.zip - : $(baseURL)/yasm-1.1.0-x86-gcc4-2011-05-14.zip ; + yasm-1.1.0-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/yasm-1.1.0-r1a3-x86-gcc4-2011-05-20.zip ; } else { InstallOptionalHaikuImagePackage yasm-1.1.0-r1a3-x86-gcc2-2011-05-17.zip