i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added gcc4 packages for cmake and lua.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39221 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-10-31 00:40:25 +00:00
parent e7682a8e3e
commit 2a28aaa447
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+21 -2
View File
@@ -452,6 +452,14 @@ if [ IsOptionalHaikuImagePackageAdded CLucene ] {
if [ IsOptionalHaikuImagePackageAdded CMake ] { if [ IsOptionalHaikuImagePackageAdded CMake ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package CMake available for $(TARGET_ARCH)" ; Echo "No optional package CMake available for $(TARGET_ARCH)" ;
} else {
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 { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cmake-2.8.2-x86-gcc2-2010-10-13.zip cmake-2.8.2-x86-gcc2-2010-10-13.zip
@@ -461,6 +469,7 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
; ;
} }
} }
}
# Curl # Curl
@@ -1059,11 +1068,21 @@ if [ IsOptionalHaikuImagePackageAdded Lua ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Lua available for $(TARGET_ARCH)" ; Echo "No optional package Lua available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
lua-5.1.4--x86-gcc2-2010-10-29.zip lua-5.1.4-x86-gcc4-2010-10-31.zip
: $(baseURL)/lua-5.1.4--x86-gcc2-2010-10-29.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
;
}
} }
} }