[mapnik] 01/02: Disable parallel builds on arm64 & armel.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Oct 14 15:20:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit 5ee157bb26ba664814835fa32ebc6e282f6fccdb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Oct 14 16:50:17 2015 +0200
Disable parallel builds on arm64 & armel.
---
debian/changelog | 6 ++++++
debian/rules | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 7fe984f..523b7cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (3.0.7+ds-2) UNRELEASED; urgency=medium
+
+ * Disable parallel builds on arm64 & armel.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 14 Oct 2015 16:49:53 +0200
+
mapnik (3.0.7+ds-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 333b8bf..7966e90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,11 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
endif
+# Disable parallel builds for problematic architectures
+ifeq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel"))
+ NJBOS = -j1
+endif
+
# scons flags
SCONS = $(shell which scons)
SCONS_FLAGS := $(NJOBS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git
More information about the Pkg-grass-devel
mailing list