Author: mmadia Date: 2011-04-03 02:11:21 +0200 (Sun, 03 Apr 2011) New Revision: 41168 Changeset: https://dev.haiku-os.org/changeset/41168 Ticket: https://dev.haiku-os.org/ticket/7412 Modified: haiku/trunk/build/jam/OptionalPackages Log: Revert APR and APR-Util to pre-r41106 builds, until the issue reported in #7412 can be fixed properly. Modified: haiku/trunk/build/jam/OptionalPackages =================================================================== --- haiku/trunk/build/jam/OptionalPackages 2011-04-02 13:37:59 UTC (rev 41167) +++ haiku/trunk/build/jam/OptionalPackages 2011-04-03 00:11:21 UTC (rev 41168) @@ -114,12 +114,12 @@ 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 $(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 ; } }