Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the isCDPackage argument for Curl and SQLite.

Browse Source 
This allows WebPositive to run on LiveCD (ISO) images again.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40824 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2011-03-05 20:28:30 +00:00
parent 2f860da9e3
commit 280a51c2b8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/jam/OptionalPackages
View File

@ -440,12 +440,10 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] {
Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc4-2011-02-28.zip
: $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip
: : true ;
: $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip ;
} else {
InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc2-2011-02-28.zip
: $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip
: : true ;
: $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip ;
}
}
@ -1451,13 +1449,11 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
sqlite-3.7.5-x86-gcc4-2011-02-28.zip
: $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-28.zip
: : true ;
: $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-28.zip ;
} else {
InstallOptionalHaikuImagePackage
sqlite-3.7.5-x86-gcc2-2011-02-25.zip
: $(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip
: : true ;
: $(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip ;
}
}
}