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

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 6 Mar 2011 14:11:25 +0100 (CET)

Author: mmadia
Date: 2011-03-06 14:11:24 +0100 (Sun, 06 Mar 2011)
New Revision: 40840
Changeset: http://dev.haiku-os.org/changeset/40840

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Corrected GetText' jam code. It will now be added to a pure gcc2 package.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2011-03-06 12:03:46 UTC (rev 
40839)
+++ haiku/trunk/build/jam/OptionalPackages      2011-03-06 13:11:24 UTC (rev 
40840)
@@ -803,18 +803,14 @@
                                gettext-0.18.1.1-x86-gcc4-2011-02-07.zip
                                : 
$(baseURL)/gettext-0.18.1.1-x86-gcc4-2011-02-07.zip
                                : : true ;
-                       InstallSourceArchive 
gettext-0.18.1.1_haiku-2011-02-07.tar.xz
-                               : 
$(baseSourceURL)/2010/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
-               } else if $(HAIKU_GCC_VERSION[1]) = 2 && $(isHybridBuild) {
+               } else {
                        InstallOptionalHaikuImagePackage
                                gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
                                : 
$(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip
                                : : true ;
-                       InstallSourceArchive 
gettext-0.18.1.1_haiku-2011-02-07.tar.xz
-                               : 
$(baseSourceURL)/2011/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
-               } else {
-                       Echo "No optional package GetText available for 
$(TARGET_ARCH)-gcc2" ;
                }
+               InstallSourceArchive gettext-0.18.1.1_haiku-2011-02-07.tar.xz
+                       : 
$(baseSourceURL)/2010/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ;
        }
 }
 


Other related posts:

  • » [haiku-commits] r40840 - haiku/trunk/build/jam - mattmadia