Patch from Joseph Protsko: P7zip optional package for GCC4 (#4842)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33763 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2009-10-25 20:01:33 +00:00
parent 7691a788d0
commit 106e455e76
1 changed files with 11 additions and 6 deletions

View File

@ -692,13 +692,18 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
if [ IsOptionalHaikuImagePackageAdded P7zip ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package P7zip available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage p7zip-9.04-r1a1-x86-gcc2-2009-08-30
: $(baseURL)/p7zip-9.04-r1a1-x86-gcc2-2009-08-30.zip
:
;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc4-2009-10-25
: $(baseURL)/p7zip-9.04-x86-gcc4-2009-10-25.zip
:
;
} else {
InstallOptionalHaikuImagePackage p7zip-9.04-x86-gcc2-2009-10-25
: $(baseURL)/p7zip-9.04-x86-gcc2-2009-10-25.zip
:
;
}
actions BuildHaikuImageExpanderRules
{