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

Fixed several conditionals. Added a TODO about a duplicate Libmng, libmng.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39228 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-10-31 12:02:35 +00:00
parent 1c9f7a4117
commit 92dc6fdfb5
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+3 -15
View File
@@ -142,14 +142,8 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package ArmyKnife available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package ArmyKnife for gcc4" ;
# InstallOptionalHaikuImagePackage armyknife-61-x86-gcc4-2010-10-30.zip
# : $(baseURL)/armyknife-61-x86-gcc4-2010-10-30.zip
# :
# ;
# AddSymlinkToHaikuImage home config be Applications
# : /boot/apps/ArmyKnife/ArmyKnife ;
} else {
InstallOptionalHaikuImagePackage armyknife-61-x86-gcc2-2010-10-30.zip
: $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip
@@ -1474,7 +1468,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package TagLib available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package TagLib available for $(TARGET_ARCH)-gcc4" ;
} else {
InstallOptionalHaikuImagePackage
@@ -1623,14 +1617,8 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
if [ IsOptionalHaikuImagePackageAdded Vision ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Vision available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Vision for gcc4" ;
# InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-10-30.zip
# : $(baseURL)/vision-908-x86-gcc4-2010-10-30.zip
# :
# ;
# AddSymlinkToHaikuImage home config be Applications
# : /boot/apps/Vision/Vision ;
} else {
InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip
: $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip