[haiku-commits] r39221 - haiku/trunk/build/jam
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 31 Oct 2010 02:40:26 +0200 (CEST)
Author: scottmc
Date: 2010-10-31 02:40:25 +0200 (Sun, 31 Oct 2010)
New Revision: 39221
Changeset: http://dev.haiku-os.org/changeset/39221
Modified:
haiku/trunk/build/jam/OptionalPackages
Log:
Added gcc4 packages for cmake and lua.
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2010-10-30 23:10:36 UTC (rev
39220)
+++ haiku/trunk/build/jam/OptionalPackages 2010-10-31 00:40:25 UTC (rev
39221)
@@ -453,12 +453,21 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package CMake available for $(TARGET_ARCH)" ;
} else {
- InstallOptionalHaikuImagePackage
- cmake-2.8.2-x86-gcc2-2010-10-13.zip
- : $(baseURL)/cmake-2.8.2-x86-gcc2-2010-10-13.zip
- :
- : true
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ cmake-2.8.2-x86-gcc4-2010-10-31.zip
+ : $(baseURL)/cmake-2.8.2-x86-gcc4-2010-10-31.zip
+ :
+ : true
+ ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ cmake-2.8.2-x86-gcc2-2010-10-13.zip
+ : $(baseURL)/cmake-2.8.2-x86-gcc2-2010-10-13.zip
+ :
+ : true
+ ;
+ }
}
}
@@ -1059,11 +1068,21 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Lua available for $(TARGET_ARCH)" ;
} else {
- InstallOptionalHaikuImagePackage
- lua-5.1.4--x86-gcc2-2010-10-29.zip
- : $(baseURL)/lua-5.1.4--x86-gcc2-2010-10-29.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ lua-5.1.4-x86-gcc4-2010-10-31.zip
+ : $(baseURL)/lua-5.1.4-x86-gcc4-2010-10-31.zip
+ :
+ : true
+ ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ lua-5.1.4-x86-gcc2-2010-10-29.zip
+ : $(baseURL)/lua-5.1.4-x86-gcc2-2010-10-29.zip
+ :
+ : true
+ ;
+ }
}
}
Other related posts:
- » [haiku-commits] r39221 - haiku/trunk/build/jam - scott mc
