[mapnik] 05/07: Re-enable parallel builds, problematic architectures no longer supported.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Oct 10 15:10:28 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 f7f079cb226e9ba8ff4d966d31b795292e49fe9e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Oct 10 12:07:51 2015 +0200
Re-enable parallel builds, problematic architectures no longer supported.
---
debian/changelog | 1 +
debian/rules | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0427885..2cd048f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mapnik (3.0.6+ds-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Re-enable parallel builds, problematic architectures no longer supported.
-- Bas Couwenberg <sebastic at debian.org> Sat, 10 Oct 2015 11:49:29 +0200
diff --git a/debian/rules b/debian/rules
index 29cddee..798096e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+NJOBS := -j1
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+
# scons flags
-# Disable parallel build - it exhausts memory on s390, mipsel, mips
SCONS = $(shell which scons)
-SCONS_FLAGS := -j1
+SCONS_FLAGS := $(NJOBS)
# -O2
SCONS_FLAGS += OPTIMIZATION=2
SCONS_FLAGS += FULL_LIB_PATH=False
@@ -23,7 +27,7 @@ SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg
SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0"
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_clean:
rm -rf build-python
--
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