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

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 5 Mar 2011 21:28:30 +0100 (CET)

Author: mmadia
Date: 2011-03-05 21:28:30 +0100 (Sat, 05 Mar 2011)
New Revision: 40824
Changeset: http://dev.haiku-os.org/changeset/40824

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Removed the isCDPackage argument for Curl and SQLite.
This allows WebPositive to run on LiveCD (ISO) images again.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2011-03-05 20:12:30 UTC (rev 
40823)
+++ haiku/trunk/build/jam/OptionalPackages      2011-03-05 20:28:30 UTC (rev 
40824)
@@ -440,12 +440,10 @@
                Echo "No optional package Curl available for $(TARGET_ARCH)" ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                InstallOptionalHaikuImagePackage 
curl-7.21.4-x86-gcc4-2011-02-28.zip
-                       : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip
-                       : : true ;
+                       : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-28.zip ;
        } else {
                InstallOptionalHaikuImagePackage 
curl-7.21.4-x86-gcc2-2011-02-28.zip
-                       : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip
-                       : : true ;
+                       : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip ;
        }
 }
 
@@ -1451,13 +1449,11 @@
                if $(HAIKU_GCC_VERSION[1]) >= 4 {
                        InstallOptionalHaikuImagePackage
                                sqlite-3.7.5-x86-gcc4-2011-02-28.zip
-                               : 
$(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-28.zip
-                               : : true ;
+                               : 
$(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-28.zip ;
                } else {
                        InstallOptionalHaikuImagePackage
                                sqlite-3.7.5-x86-gcc2-2011-02-25.zip
-                               : 
$(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip
-                               : : true ;
+                               : 
$(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip ;
                }
        }
 }


Other related posts:

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