Bug#683767: ppl: diff for NMU version 0.11.2-6.2
Dear maintainers,
I've prepared an NMU for ppl (versioned as 0.11.2-6.2) correcting a
FTBFS caused by my previous NMU (0.11.2-6.1). Thijs Kinkhorst is going
to sponsor the new upload to DELAYED/5. Please feel free to tell us if
he should delay it longer.
Regards.
diff -Nru ppl-0.11.2/debian/changelog ppl-0.11.2/debian/changelog
--- ppl-0.11.2/debian/changelog 2012-07-22 12:02:06.000000000 +0200
+++ ppl-0.11.2/debian/changelog 2012-08-03 18:52:06.000000000 +0200
@@ -1,3 +1,13 @@
+ppl (0.11.2-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Colin Watson <cjwatson@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@free.fr> Fri, 03 Aug 2012 18:50:55 +0200
+
ppl (0.11.2-6.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru ppl-0.11.2/debian/rules ppl-0.11.2/debian/rules
--- ppl-0.11.2/debian/rules 2011-10-10 19:59:01.000000000 +0200
+++ ppl-0.11.2/debian/rules 2012-08-03 18:46:07.000000000 +0200
@@ -47,6 +47,13 @@
# 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 @@
# 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)."
Reply to: