This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 154d4510f5c9a63fddbb690c32951f4b167a6dc5
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Wed Oct 14 17:27:23 2015 +0200

    Fix disabling of parallel builds on arm64 & armel.
---
 debian/changelog | 6 ++++++
 debian/rules     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0732d2d..ac28577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (3.0.7+ds-3) UNRELEASED; urgency=medium
+
+  * Fix disabling of parallel builds on arm64 & armel. 
+
+ -- Bas Couwenberg <sebas...@debian.org>  Wed, 14 Oct 2015 17:26:59 +0200
+
 mapnik (3.0.7+ds-2) unstable; urgency=medium
 
   * Disable parallel builds on arm64 & armel. 
diff --git a/debian/rules b/debian/rules
index 7966e90..5381a00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,10 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), 
,$(DEB_BUILD_OPTIONS))))
 NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), 
,$(DEB_BUILD_OPTIONS))))
 endif
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 # Disable parallel builds for problematic architectures
-ifeq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel"))
+ifneq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel"))
        NJBOS = -j1
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapnik.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to