From 003ebfa1cc0a249bc83ad64cbe2b4be2564d84b6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 22 May 2011 06:11:12 +0000 Subject: [PATCH] Updated gcc4 OptionalPackages apr, apr-util, beae, burnitnow, ccache and sqlite, for alpha3. +alpha3 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41647 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 43 +++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index fdfef2ef6b..208deaf980 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -114,11 +114,13 @@ if [ IsOptionalHaikuImagePackageAdded APR ] { if $(TARGET_ARCH) != x86 { Echo "No optional package APR available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc4-2011-05-05.zip - : $(baseURL)/apr-1.4.2-x86-gcc4-2011-05-05.zip + InstallOptionalHaikuImagePackage + apr-1.4.2-r1a3-x86-gcc4-2011-05-21.zip + : $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-21.zip : : true ; } else { - InstallOptionalHaikuImagePackage apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip + InstallOptionalHaikuImagePackage + apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/apr-1.4.2-r1a3-x86-gcc2-2011-05-17.zip : : true ; } @@ -130,11 +132,13 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { if $(TARGET_ARCH) != x86 { Echo "No optional package APR-util available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc4-2011-05-05.zip - : $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-05-05.zip + InstallOptionalHaikuImagePackage + apr-util-1.3.10-r1a3-x86-gcc4-2011-05-21.zip + : $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-21.zip : : true ; } else { - InstallOptionalHaikuImagePackage apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip + InstallOptionalHaikuImagePackage + apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc2-2011-05-17.zip : : true ; } @@ -148,7 +152,8 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package ArmyKnife for gcc4" ; } else { - InstallOptionalHaikuImagePackage armyknife-61-r1a3-x86-gcc2-2011-05-20.zip + InstallOptionalHaikuImagePackage + armyknife-61-r1a3-x86-gcc2-2011-05-20.zip : $(baseURL)/armyknife-61-r1a3-x86-gcc2-2011-05-20.zip ; AddSymlinkToHaikuImage home config be Applications : /boot/apps/ArmyKnife/ArmyKnife ; @@ -176,10 +181,12 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] { Echo "No optional package BeAE available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip - : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ; + InstallOptionalHaikuImagePackage + beae-22-r1a3-x86-gcc4-2011-05-21.zip + : $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-21.zip ; } else { - InstallOptionalHaikuImagePackage beae-22-r1a3-x86-gcc2-2011-05-18.zip + InstallOptionalHaikuImagePackage + beae-22-r1a3-x86-gcc2-2011-05-18.zip : $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ; } AddSymlinkToHaikuImage home config be Applications @@ -324,10 +331,12 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] { Echo "No optional package BurnItNow available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc4-2010-09-15.zip - : $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ; + InstallOptionalHaikuImagePackage + burnitnow-39-r1a3-x86-gcc4-2011-05-21.zip + : $(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-21.zip ; } else { - InstallOptionalHaikuImagePackage burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip + InstallOptionalHaikuImagePackage + burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip : $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ; } AddSymlinkToHaikuImage home config be Applications @@ -360,8 +369,8 @@ if [ IsOptionalHaikuImagePackageAdded CCache ] { Echo "No optional package CCache available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ccache-3.1.4-x86-gcc4-2011-05-12.zip - : $(baseURL)/ccache-3.1.4-x86-gcc4-2011-05-12.zip ; + ccache-3.0.1-r1a3-x86-gcc4-2011-05-21.zip + : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-21.zip ; } else { InstallOptionalHaikuImagePackage ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip @@ -1437,8 +1446,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sqlite-3.7.5-x86-gcc4-2011-03-16.zip - : $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-03-16.zip ; + sqlite-3.7.5-r1a3-x86-gcc4-2011-05-21.zip + : $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-21.zip ; } else { InstallOptionalHaikuImagePackage sqlite-3.7.5-r1a3-x86-gcc2-2011-05-17.zip