[ppl] 44/68: Imported Debian patch 0.11.2-6.2

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ppl.

commit b2bf44cc84e40a4af9af036a8b4f7ebb7510587d
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Fri Aug 3 18:50:55 2012 +0200

    Imported Debian patch 0.11.2-6.2
---
 debian/changelog | 10 ++++++++++
 debian/rules     | 11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b98bdb..ee1b3b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ppl (0.11.2-6.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Colin Watson <cjwatson at ubuntu.com> ]
+  * Build the test suite with -gstabs rather than -g on powerpc, to avoid
+    running out of memory, see Ubuntu bug #941676 (Closes: #683767)
+
+ -- Nicolas Boulenguez <nicolas.boulenguez at free.fr>  Fri, 03 Aug 2012 18:50:55 +0200
+
 ppl (0.11.2-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index 073e154..0f722f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,13 @@ endif
 # have to be configured before the dpkg-buildpackage command.
 PPL_VERSION = $(shell grep "^AC_INIT" $(CURDIR)/configure.ac | sed -e "s/^AC_INIT.\[[^]]*\],[ \t]*\[\([^]]*\)\],.*/\1/")
 
+ifeq (powerpc-linux-gnu,$(DEB_HOST_GNU_TYPE))
+  # powerpc runs out of memory building the test suite with -g, but is OK
+  # with -gstabs instead.
+  CHECK_ENV := CFLAGS="$(CFLAGS:-g=-gstabs)" CXXFLAGS="$(CXXFLAGS:-g=-gstabs)"
+else
+  CHECK_ENV :=
+endif
 
 configure: configure-stamp
 configure-stamp:
@@ -78,9 +85,9 @@ ifeq ($(with_check),yes)
 	# There are some failures in the testsuite on alpha,
 	# maybe related to http://gcc.gnu.org/PR8966
 	# Testsuite is miscompiled on arm, see #593324
-	$(MAKE) $(NJOBS) -k check || true
+	$(MAKE) $(NJOBS) -k check $(CHECK_ENV) || true
   else
-	$(MAKE) $(NJOBS) check
+	$(MAKE) $(NJOBS) check $(CHECK_ENV)
   endif
 else
 	@echo "Testsuite not run: $(with_check)."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git