[cowdancer] 01/01: Build with -O2 on ppc64el to fix FTBFS

James Clarke jrtc27-guest at moszumanska.debian.org
Thu Jun 30 20:56:10 UTC 2016


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

jrtc27-guest pushed a commit to branch master
in repository cowdancer.

commit 680af52f21391b45e365b15466fbe8e05a3043cf
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Jun 11 14:30:10 2016 +0100

    Build with -O2 on ppc64el to fix FTBFS
    
    Ubuntu defaults to -O3, which causes a leak to be detected in the test
    suite on ppc64el. Force -O2 instead (whilst still honouring noopt) as a
    workaround.
---
 debian/rules | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/rules b/debian/rules
index b387846..caaf4a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,17 @@
 export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+# Work around FTBFS on ppc64el in Ubuntu, which uses -O3 by default instead
+# of -O2 like Debian. TODO: Investigate and fix root cause.
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+export DEB_CFLAGS_MAINT_STRIP = -O3
+export DEB_CFLAGS_MAINT_APPEND = -O2
+endif
+endif
+
 %:
 	dh $@ --parallel
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/cowdancer.git



More information about the Pbuilder-maint mailing list