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
This commit is contained in:
parent
e34d20ad08
commit
b0e6c980ed
@ -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 ;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user