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

cross devel hpkg: use suffix/subdir for secondary arch

Browse Source 
* Libraries for a secondary architectures must be placed in a respective
  subdir.
* Add a suffix to the package name when building for a secondary
  architecture. Looks a bit weird
  ("haiku_cross_devel_sysroot_x86_gcc_x86.hpkg"), but is consistent.
This commit is contained in:
Ingo Weinhold 2013-08-03 05:26:25 +02:00
parent b0944c78b0
commit 833b6688aa
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/jam/packages/HaikuCrossDevel
View File

@ -4,9 +4,16 @@
# The main use of this package is to provide HaikuPorter with a development
# environment for a cross-build Haiku platform.
local primaryArchitecture = $(HAIKU_PACKAGING_ARCHS[1]) ;
local architecture = $(TARGET_PACKAGING_ARCH) ;
local isPrimaryArchitecture = [ MultiArchIfPrimary 1 : ] ;
local packageNameSuffix = $(primaryArchitecture) ;
local architectureSubDir ;
if ! $(isPrimaryArchitecture) {
packageNameSuffix = $(primaryArchitecture)_$(architecture) ;
architectureSubDir = $(architecture) ;
}
local additionalLibraries_stage1 ;
local additionalLibraries
@ -17,10 +24,10 @@ for stage in _stage1 "" {
# first create the actual cross development package
local haikuCrossDevelSysrootPackage
= haiku_cross_devel_sysroot$(stage)_$(architecture).hpkg ;
= haiku_cross_devel_sysroot$(stage)_$(packageNameSuffix).hpkg ;
HaikuPackage $(haikuCrossDevelSysrootPackage) ;
local developCrossLibDirTokens = develop lib ;
local developCrossLibDirTokens = develop lib $(architectureSubDir) ;
# glue code
AddFilesToPackage $(developCrossLibDirTokens) :
@ -82,8 +89,8 @@ for stage in _stage1 "" {
# system hierarchy of the target system, from where haikuporter will fetch
# it when needed.
local haikuCrossDevelPackage
= haiku_cross_devel$(stage)_$(architecture).hpkg ;
local haikuCrossDevelPackage
= haiku_cross_devel$(stage)_$(packageNameSuffix).hpkg ;
HaikuPackage $(haikuCrossDevelPackage) ;
# add the wrapped package