This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik.
commit 6d32eb93ff75d275c98526d4ac023a40e8266ce0
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Nov 4 00:31:17 2015 +0100
Disable parallel builds for Ubuntu on amd64 & ppc64el too.
---
debian/changelog | 6 ++++++
debian/rules | 11 ++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f8a199f..3a189a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapnik (3.0.9~rc1+ds-1~exp2) UNRELEASED; urgency=medium
+
+ * Disable parallel builds for Ubuntu on amd64 & ppc64el too.
+
+ -- Bas Couwenberg <sebas...@debian.org> Wed, 04 Nov 2015 00:29:07 +0100
+
mapnik (3.0.9~rc1+ds-1~exp1) experimental; urgency=medium
* New upstream release candidate.
diff --git a/debian/rules b/debian/rules
index b475ed5..649fcaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,16 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
# Disable parallel builds for problematic architectures
-ifneq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel"))
+NO_PARALLEL_ARCHS = "arm64 armel"
+
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+ # From mapnik (3.0.8+ds-1ubuntu1):
+ # The amd64 buildds are castrated to 4G RAM and 4G swap,
+ # the ppc64el buildds to 12G RAM and 4G swap.
+ NO_PARALLEL_ARCHS += "amd64 ppc64el"
+endif
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_PARALLEL_ARCHS)))
NJOBS = -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
