[haiku-commits] r41474 - haiku/trunk/build/jam

  • From: scott mc <scottmc2@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 13 May 2011 17:36:25 +0200 (CEST)

Author: scottmc
Date: 2011-05-13 17:36:25 +0200 (Fri, 13 May 2011)
New Revision: 41474
Changeset: https://dev.haiku-os.org/changeset/41474

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Added gcc4 taglib optionalpackage


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2011-05-13 15:31:10 UTC (rev 
41473)
+++ haiku/trunk/build/jam/OptionalPackages      2011-05-13 15:36:25 UTC (rev 
41474)
@@ -1469,14 +1469,14 @@
 if [ IsOptionalHaikuImagePackageAdded TagLib ] {
        if $(TARGET_ARCH) != x86 {
                Echo "No optional package TagLib available for $(TARGET_ARCH)" ;
+       } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
+               InstallOptionalHaikuImagePackage
+                       taglib-1.6.3-x86-gcc4-2011-05-13.zip
+                       : $(baseURL)/taglib-1.6.3-x86-gcc4-2011-05-13.zip ;     
        
        } else {
-               if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-                       Echo "No optional package TagLib available for 
$(TARGET_ARCH)-gcc4" ;
-               } else {
-                       InstallOptionalHaikuImagePackage
-                               taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip
-                               : 
$(baseURL)/taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip ;
-               }
+               InstallOptionalHaikuImagePackage
+                       taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip
+                       : $(baseURL)/taglib-1.6.3-r1a2-x86-gcc2-2010-04-25.zip ;
        }
 }
 


Other related posts:

  • » [haiku-commits] r41474 - haiku/trunk/build/jam - scott mc