[haiku-commits] r33763 - haiku/trunk/build/jam
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 25 Oct 2009 21:01:33 +0100 (CET)
Author: korli
Date: 2009-10-25 21:01:33 +0100 (Sun, 25 Oct 2009)
New Revision: 33763
Changeset: http://dev.haiku-os.org/changeset/33763/haiku
Modified:
haiku/trunk/build/jam/OptionalPackages
Log:
Patch from Joseph Protsko: P7zip optional package for GCC4 (#4842)
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2009-10-25 15:14:49 UTC (rev
33762)
+++ haiku/trunk/build/jam/OptionalPackages 2009-10-25 20:01:33 UTC (rev
33763)
@@ -692,13 +692,18 @@
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
{
Other related posts:
- » [haiku-commits] r33763 - haiku/trunk/build/jam - korli
