Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DefineDefaultBuildProfiles: Various fixes 

* Fix adding WebPositive optional package.
* Fix adding wonderbrush package. Add it only for gcc2 to avoid a
  warning by AddHaikuImagePackages.
* Simplify adding xz_utils package.
This commit is contained in:
Ingo Weinhold 2013-11-24 13:33:44 +01:00
parent 5ce49bd3db
commit 047b2d25f5
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
build/jam/DefaultBuildProfiles
View File

@ -49,34 +49,26 @@ rule DefineDefaultBuildProfiles
subversion subversion
timgmsoundfont timgmsoundfont
vision vision
wonderbrush
wpa_supplicant wpa_supplicant
wqy_microhei wqy_microhei
# xz_utils can't be built with gcc2, so we install it for
# primary gcc 4 architectures or gcc 2 hybrids.
xz_utils@!gcc2 xz_utils@!gcc2
gcc2 @{ xz_utils_x86@secondary_x86 }@
; ;
# xz_utils can't be built with gcc2, so a mere gcc2 system doesn't
# have it. However, xz_utils does exist for the secondary (gcc4)
# architecture of a gcc2 hybrid.
if $(HAIKU_PACKAGING_ARCHS) != x86_gcc2 {
AddHaikuImagePackages
xz_utils_x86@gcc2
;
}
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
AddHaikuImagePackages openssl ; AddHaikuImagePackages openssl wonderbrush@gcc2 ;
} }
} }
AddOptionalHaikuImagePackages BeBook Development Git AddOptionalHaikuImagePackages BeBook Development Git Welcome ;
Welcome ;
# Temporary until WebPositive is fixed on x86_64 # Temporary until WebPositive is fixed on x86_64
if $(HAIKU_PACKAGING_ARCHS) != x86_64 { if $(HAIKU_PACKAGING_ARCHS) != x86_64 {
AddHaikuImagePackages WebPositive ; AddOptionalHaikuImagePackages WebPositive ;
} }
} }
@ -101,14 +93,17 @@ rule DefineDefaultBuildProfiles
pe pe
vision vision
wpa_supplicant wpa_supplicant
xz_utils # xz_utils can't be built with gcc2, so we install it for
# primary gcc 4 architectures or gcc 2 hybrids.
xz_utils@!gcc2
gcc2 @{ xz_utils_x86@secondary_x86 }@
; ;
AddOptionalHaikuImagePackages Development Git ; AddOptionalHaikuImagePackages Development Git ;
# Temporary until WebPositive is fixed on x86_64 # Temporary until WebPositive is fixed on x86_64
if $(HAIKU_PACKAGING_ARCHS) != x86_64 { if $(HAIKU_PACKAGING_ARCHS) != x86_64 {
AddHaikuImagePackages WebPositive ; AddOptionalHaikuImagePackages WebPositive ;
} }
} }