[haiku-commits] BRANCH HaikuPM-github.package-management [d20975d] build/jam
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 5 Aug 2013 22:00:35 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: b2b6052e4075d5137bace6f851f0e26eebb4b600
new head: d20975d920acd45775064d3181c7aa0d94e77c95
overview: https://github.com/haiku/HaikuPM/compare/b2b6052...d20975d
----------------------------------------------------------------------------
0b171ae: Fix two problems when building without secondary architecture.
d20975d: Fix negated predicate relating to input_server.
* without a secondary arch, jam would complain about not knowing how
to build <x86_gcc>input_server
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 9 insertions(+), 4 deletions(-)
build/jam/ArchitectureRules | 2 +-
build/jam/RepositoryRules | 11 ++++++++---
############################################################################
Commit: 0b171ae44a83e009f91b5e769acfffaeb73767a1
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Mon Aug 5 19:36:25 2013 UTC
Fix two problems when building without secondary architecture.
----------------------------------------------------------------------------
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index fc03556..d02289f 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -309,8 +309,13 @@ actions BootstrapRepositoryFetchPackage1
cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
- $(HOST_HAIKU_PORTER) --cross-devel-package "$haikuCrossDevelPackage" \
- "$secondaryCrossDevelPackages" $portName
+ if [ -n "$secondaryCrossDevelPackages" ]; then
+ $(HOST_HAIKU_PORTER) --cross-devel-package
"$haikuCrossDevelPackage" \
+ "$secondaryCrossDevelPackages" $portName
+ else
+ $(HOST_HAIKU_PORTER) --cross-devel-package
"$haikuCrossDevelPackage" \
+ $portName
+ fi
}
@@ -350,7 +355,7 @@ EOF
echo \" >> $(1)
echo SECONDARY_CROSS_TOOLS=\" >> $(1)
- for gcc in $(HAIKU_CC_$(HAIKU_PACKAGING_ARCHS[2-])); do
+ for gcc in $(HAIKU_CC_$(HAIKU_PACKAGING_ARCHS[2-])) ; do
dir=`dirname $gcc`
dir=`dirname $dir`
echo " $dir" >> $(1)
############################################################################
Commit: d20975d920acd45775064d3181c7aa0d94e77c95
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Mon Aug 5 19:44:12 2013 UTC
Fix negated predicate relating to input_server.
* without a secondary arch, jam would complain about not knowing how
to build <x86_gcc>input_server
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 2b81873..9debd66 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -249,7 +249,7 @@ rule ArchitectureSetup architecture
= $(HAIKU_LIBSUPC++_$(architecture)) ;
HAIKU_LIBRARY_NAME_MAP_$(architecture)_localestub
= <$(architecture)>liblocalestub.a ;
- if $(architecture) != $(HAIKU_PACKAGING_ARCHS[1]) {
+ if $(architecture) = $(HAIKU_PACKAGING_ARCHS[1]) {
HAIKU_LIBRARY_NAME_MAP_$(architecture)_input_server
= <nogrist>input_server ;
} else {
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [d20975d] build/jam - HaikuPM-github . package-management
