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

Added new gcc2 and gcc4 OptionalPackages for FRiSS, fixed some more typos.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41862 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2011-06-01 20:44:07 +00:00
parent eb1b3e422f
commit 53592f6036
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+15 -9
View File
@@ -347,7 +347,7 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] {
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
bzip2-1.0.6-x86-r1a3-x86-gcc2-2011-05-17.zip bzip2-1.0.6-r1a3-x86-gcc2-2011-05-17.zip
: $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc2-2011-05-17.zip
: : true ; : : true ;
} }
@@ -433,7 +433,7 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
cmake-2.8.4-x86-r1a3-x86-gcc2-2011-05-19.zip cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
: $(baseURL)/cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip : $(baseURL)/cmake-2.8.4-r1a3-x86-gcc2-2011-05-19.zip
: : true ; : : true ;
} }
@@ -786,12 +786,18 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] {
if [ IsOptionalHaikuImagePackageAdded friss ] { if [ IsOptionalHaikuImagePackageAdded friss ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package friss available for $(TARGET_ARCH)" ; Echo "No optional package friss available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) {
InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip
: $(baseURL)/friss-0.5pre7-x86-gcc4.zip
: : true ;
} else { } else {
Echo "No optional package friss available for gcc2" ; if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
friss-24-r1a3-x86-gcc4-2011-05-31.zip
: $(baseURL)/friss-24-r1a3-x86-gcc4-2011-05-31.zip ;
} else {
InstallOptionalHaikuImagePackage
friss-24-r1a3-x86-gcc2-2011-05-31.zip
: $(baseURL)/friss-24-r1a3-x86-gcc2-2011-05-31.zip ;
}
AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/apps/FRiSS/FRiSS ;
} }
} }
@@ -828,7 +834,7 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
: : true ; : : true ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
git-1.7.5-x86-r1a3-x86-gcc2-2011-05-18.zip git-1.7.5-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/git-1.7.5-r1a3-x86-gcc2-2011-05-18.zip : $(baseURL)/git-1.7.5-r1a3-x86-gcc2-2011-05-18.zip
: : true ; : : true ;
} }
@@ -953,7 +959,7 @@ if [ IsOptionalHaikuImagePackageAdded LibEvent ] {
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libevent-2.0.10-x86-r1a3-x86-gcc4-2011-05-24.zip libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip
: $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip : $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip
: : true ; : : true ;
} else { } else {