From 00a625f4b8d93b3fc4130ba0eedb5a3ac677c3db Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 3 Apr 2011 00:11:21 +0000 Subject: [PATCH] Revert APR and APR-Util to pre-r41106 builds, until the issue reported in #7412 can be fixed properly. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41168 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index d72894768d..b7455f5355 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-2011-03-28.zip - : $(baseURL)/apr-1.4.2-x86-gcc4-2011-03-28.zip + InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc4-2010-11-12.zip + : $(baseURL)/apr-1.4.2-x86-gcc4-2010-11-12.zip : : true ; } else { - InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2011-03-28.zip - : $(baseURL)/apr-1.4.2-x86-gcc2-2011-03-28.zip + InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2010-10-13.zip + : $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.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-2011-03-28.zip - : $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-03-28.zip + InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc4-2010-11-12.zip + : $(baseURL)/apr-util-1.3.10-x86-gcc4-2010-11-12.zip : : true ; } else { - InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2011-03-28.zip - : $(baseURL)/apr-util-1.3.10-x86-gcc2-2011-03-28.zip + InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2010-10-13.zip + : $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip : : true ; } }