From b0e6c980ed6d5c4c9c56d0c824277a2f57d0306e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 25 Mar 2011 23:52:51 +0000 Subject: [PATCH] Updated builds of apr, apr-util and cmake to correct directory issues. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41106 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 1edb4e66f0..b8683fa995 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -114,12 +114,12 @@ 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-2010-11-12.zip - : $(baseURL)/apr-1.4.2-x86-gcc4-2010-11-12.zip + InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc4-2011-03-25.zip + : $(baseURL)/apr-1.4.2-x86-gcc4-2011-03-25.zip : : true ; } else { - InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2010-10-13.zip - : $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.zip + InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2011-03-25.zip + : $(baseURL)/apr-1.4.2-x86-gcc2-2011-03-25.zip : : true ; } } @@ -130,12 +130,12 @@ 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-2010-11-12.zip - : $(baseURL)/apr-util-1.3.10-x86-gcc4-2010-11-12.zip + InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc4-2011-03-25.zip + : $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-03-25.zip : : true ; } else { - InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2010-10-13.zip - : $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip + InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2011-03-25.zip + : $(baseURL)/apr-util-1.3.10-x86-gcc2-2011-03-25.zip : : true ; } } @@ -417,13 +417,13 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cmake-2.8.4-x86-gcc4-2011-03-22.zip - : $(baseURL)/cmake-2.8.4-x86-gcc4-2011-03-22.zip + cmake-2.8.4-x86-gcc4-2011-03-25.zip + : $(baseURL)/cmake-2.8.4-x86-gcc4-2011-03-25.zip : : true ; } else { InstallOptionalHaikuImagePackage - cmake-2.8.4-x86-gcc2-2011-03-14.zip - : $(baseURL)/cmake-2.8.4-x86-gcc2-2011-03-14.zip + cmake-2.8.4-x86-gcc2-2011-03-25.zip + : $(baseURL)/cmake-2.8.4-x86-gcc2-2011-03-25.zip : : true ; } }