Fixed apr and apr-util builds.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41136 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary 2011-03-28 15:22:37 +00:00
parent 8860817432
commit 9f6153aa51

View File

@ -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-25.zip
: $(baseURL)/apr-1.4.2-x86-gcc4-2011-03-25.zip
InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc4-2011-03-28.zip
: $(baseURL)/apr-1.4.2-x86-gcc4-2011-03-28.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2011-03-25.zip
: $(baseURL)/apr-1.4.2-x86-gcc2-2011-03-25.zip
InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2011-03-28.zip
: $(baseURL)/apr-1.4.2-x86-gcc2-2011-03-28.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-25.zip
: $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-03-25.zip
InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc4-2011-03-28.zip
: $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-03-28.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2011-03-25.zip
: $(baseURL)/apr-util-1.3.10-x86-gcc2-2011-03-25.zip
InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2011-03-28.zip
: $(baseURL)/apr-util-1.3.10-x86-gcc2-2011-03-28.zip
: : true ;
}
}