From ccd4d547b90a7cfeba6416c6b2b0c0496a7ecf6f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 May 2011 23:54:36 +0000 Subject: [PATCH] Updated gcc4 builds for box2d, neon, curl and cvs. +alpha3 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41614 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalLibPackages | 4 ++-- build/jam/OptionalPackages | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index ce1f2ae18e..9871d15602 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -67,8 +67,8 @@ if [ IsOptionalHaikuImagePackageAdded box2d ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { InstallOptionalHaikuImagePackage - box2d-2.1.2-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/box2d-2.1.2-x86-gcc4-2010-10-30.zip + box2d-2.1.2-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/lib/box2d-2.1.2-r1a3-x86-gcc4-2011-05-20.zip : : true ; } else { Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index d946f9257f..1faee1c605 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -444,8 +444,8 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc4-2011-05-10.zip - : $(baseURL)/curl-7.21.6-x86-gcc4-2011-05-10.zip ; + InstallOptionalHaikuImagePackage curl-7.21.6-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/curl-7.21.6-r1a3-x86-gcc4-2011-05-20.zip ; } else { InstallOptionalHaikuImagePackage curl-7.21.6-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/curl-7.21.6-r1a3-x86-gcc2-2011-05-17.zip ; @@ -460,8 +460,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cvs-1.12.13.1-x86-gcc4-2011-03-14.zip - : $(baseURL)/cvs-1.12.13.1-x86-gcc4-2011-03-14.zip + cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-20.zip + : $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-20.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1130,8 +1130,8 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - neon-0.29.6-x86-gcc4-2011-05-14.zip - : $(baseURL)/neon-0.29.6-x86-gcc4-2011-05-14.zip ; + neon-0.29.6-x86-r1a3-gcc4-2011-05-20.zip + : $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-20.zip ; } else { InstallOptionalHaikuImagePackage neon-0.29.6-r1a3-x86-gcc2-2011-05-18.zip