Disable optimization on i386 and kfreebsd-i386 to avoid segfaults with python7; thank...

diff --git a/debian/changelog b/debian/changelog
index 96b89724eebd78e30b37353484d47966404bf793..a4bbb2f1c11aeb67dc158d2ae3efbc6349497640 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lilypond (2.14.2-2) unstable; urgency=low
+
+  * Disable optimization on i386 and kfreebsd-i386 to avoid segfaults with
+    python7; thanks to Matthias Klose and Scott Kitterman for the
+    temporary solution. (Closes: #643664)
+
+ -- Don Armstrong <don@debian.org>  Wed, 28 Sep 2011 09:44:40 -0700
+
 lilypond (2.14.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #629520)

diff --git a/debian/rules b/debian/rules
index 339a7070d12a04a8aae7f3df63325a09c4e4e919..3e87307aed5482ca5eed04b58dbb9af3af33300b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS) CPU_COUNT=$(NUMJOBS)
 endif
 
-
 include VERSION
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
 
@@ -49,13 +48,25 @@ export HOME = /tmp
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 kfreebsd-i386))
+  config_opt = --disable-optimising
+  CFLAGS := $(filter-out -O%, $(CFLAGS))
+  CXXFLAGS := $(filter-out -O%, $(CXXFLAGS))
+else
+  config_opt = --enable-optimising
+endif
+
+
 build: build-stamp
 build-stamp:
        dh_testdir
 
        cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./stepmake/bin/
        ./configure --disable-checking --enable-debugging \
-               --prefix=/usr --enable-optimising \
+               --prefix=/usr $(config_opt) \
                --infodir='$${prefix}/share/info' \
                --mandir='$${prefix}/share/man'
        ulimit -c unlimited && $(MAKE)