[sfcgal] 01/05: Apply patch to reduce build-time memory usage on mips/mipsel.

Bas Couwenberg sebastic at debian.org
Tue Jun 20 16:24:45 UTC 2017


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

sebastic pushed a commit to branch master
in repository sfcgal.

commit 99527205ee9b0c46b4f6ffcc45e99d1f07835ca7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 20 17:53:02 2017 +0200

    Apply patch to reduce build-time memory usage on mips/mipsel.
    
    Thanks to Adrian Bunk. (closes: #865310)
---
 debian/changelog | 8 ++++++++
 debian/rules     | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d597159..a5e80d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sfcgal (1.3.1-2) UNRELEASED; urgency=medium
+
+  * Apply patch to reduce build-time memory usage on mips/mipsel.
+    Thanks to Adrian Bunk.
+    (closes: #865310)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 20 Jun 2017 17:51:58 +0200
+
 sfcgal (1.3.1-1) unstable; urgency=medium
 
   * Update symbols for other architectures.
diff --git a/debian/rules b/debian/rules
index 9821a94..e74ca11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,17 @@ DH_VERBOSE = 1
 
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# reduce debug info to fix FTBFS on archs with few address space
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
+    CMAKECXXFLAGS="-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=' -O2 -g1 -DNDEBUG'"
+endif
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with pkgkde_symbolshelper --parallel
@@ -16,6 +22,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		$(CMAKECXXFLAGS) \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \

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



More information about the Pkg-grass-devel mailing list