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:
parent
7691a788d0
commit
106e455e76
|
@ -692,13 +692,18 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
|
||||||
if [ IsOptionalHaikuImagePackageAdded P7zip ] {
|
if [ IsOptionalHaikuImagePackageAdded P7zip ] {
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) != x86 {
|
||||||
Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
|
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 {
|
} else {
|
||||||
InstallOptionalHaikuImagePackage p7zip-9.04-r1a1-x86-gcc2-2009-08-30
|
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||||
: $(baseURL)/p7zip-9.04-r1a1-x86-gcc2-2009-08-30.zip
|
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
|
actions BuildHaikuImageExpanderRules
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue