i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert APR and APR-Util to pre-r41106 builds, until the issue reported in #7412

Browse Source 
can be fixed properly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41168 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2011-04-03 00:11:21 +00:00
parent 2a06b5bdba
commit 00a625f4b8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+8 -8
View File
@@ -114,12 +114,12 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package APR available for $(TARGET_ARCH)" ; Echo "No optional package APR available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage 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-2011-03-28.zip : $(baseURL)/apr-1.4.2-x86-gcc4-2010-11-12.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage 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-2011-03-28.zip : $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.zip
: : true ; : : true ;
} }
} }
@@ -130,12 +130,12 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package APR-util available for $(TARGET_ARCH)" ; Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage 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-2011-03-28.zip : $(baseURL)/apr-util-1.3.10-x86-gcc4-2010-11-12.zip
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage 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-2011-03-28.zip : $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip
: : true ; : : true ;
} }
} }