[haiku-commits] BRANCH HaikuPM-github.package-management [f975dc6] in build: jam/packages scripts

From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 3 Aug 2013 05:30:37 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: b0944c78b074a8110bd98e060415d0e8f38a7f65
new head: f975dc63f1238bdd4876f891b0ba9eaa255f59f7
overview: https://github.com/haiku/HaikuPM/compare/b0944c7...f975dc6

----------------------------------------------------------------------------

833b668: cross devel hpkg: use suffix/subdir for secondary arch
  
  * 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.

f975dc6: build_cross_tools_gcc4: move sysroot dir into install dir
  
  This allows us to sneak in system include and library search dirs in
  haikuporter without doing anything outside the cross tools dir.

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 15 insertions(+), 5 deletions(-)
build/jam/packages/HaikuCrossDevel   | 15 +++++++++++----
build/scripts/build_cross_tools_gcc4 |  5 ++++-

############################################################################

Commit:      833b6688aac53531af3e0099f96a4b9e3acba5f5
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Sat Aug  3 03:26:25 2013 UTC

cross devel hpkg: use suffix/subdir for secondary arch

* 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.

----------------------------------------------------------------------------

diff --git a/build/jam/packages/HaikuCrossDevel 
b/build/jam/packages/HaikuCrossDevel
index ba2099f..5c9b553 100644
--- a/build/jam/packages/HaikuCrossDevel
+++ b/build/jam/packages/HaikuCrossDevel
@@ -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

############################################################################

Commit:      f975dc63f1238bdd4876f891b0ba9eaa255f59f7
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Sat Aug  3 03:29:15 2013 UTC

build_cross_tools_gcc4: move sysroot dir into install dir

This allows us to sneak in system include and library search dirs in
haikuporter without doing anything outside the cross tools dir.

----------------------------------------------------------------------------

diff --git a/build/scripts/build_cross_tools_gcc4 
b/build/scripts/build_cross_tools_gcc4
index 0a0a695..74eae68 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -109,7 +109,7 @@ objDir=${installDir}-build
 binutilsObjDir=$objDir/binutils
 gccObjDir=$objDir/gcc
 stdcxxObjDir=$objDir/stdcxx
-sysrootDir=$objDir/sysroot
+sysrootDir=$installDir/sysroot
 tmpIncludeDir=$sysrootDir/boot/system/develop/headers
 tmpLibDir=$sysrootDir/boot/system/develop/lib
 
@@ -249,6 +249,9 @@ fi
 # Only the ones from the source tree should be used.
 rm -rf $installDir/$haikuMachine/sys-include
 
+# remove the sysroot dir
+rm -rf $sysrootDir
+
 # remove the objects dir
 rm -rf $objDir
[haiku-commits] BRANCH HaikuPM-github.package-management [f975dc6] in build: jam/packages scripts

Other related posts:
