[Python-apps-commits] r9556 - in packages/mypaint/trunk/debian (changelog rules)

[achadwick-guest at users.alioth.debian.org]

    Date: Sunday, April 21, 2013 @ 20:33:50
  Author: achadwick-guest
Revision: 9556

mypaint: fix FTBFS with DEB_BUILD_OPTIONS=noopt

The Python-accessible shared libs part of MyPaint, _mypaintlib.so, was being
built incorrectly: with -O0 rather than -O1. However this reflects an
underlying problem in MyPaint's build environment, which will hopefully be
fixed in our next release.

Worked around here, and reported upstream: https://gna.org/bugs/?20754

Many thanks to Sebastian Ramacher for reporting: http://bugs.debian.org/704935

Modified:
  packages/mypaint/trunk/debian/changelog
  packages/mypaint/trunk/debian/rules

Modified: packages/mypaint/trunk/debian/changelog
===================================================================
--- packages/mypaint/trunk/debian/changelog	2013-04-21 19:52:13 UTC (rev 9555)
+++ packages/mypaint/trunk/debian/changelog	2013-04-21 20:33:50 UTC (rev 9556)
@@ -1,3 +1,9 @@
+mypaint (1.1.0-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS with DEB_BUILD_OPTIONS=noopt (closes: Bug#704935)
+
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Sun, 21 Apr 2013 20:37:02 +0100
+
 mypaint (1.1.0-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/mypaint/trunk/debian/rules
===================================================================
--- packages/mypaint/trunk/debian/rules	2013-04-21 19:52:13 UTC (rev 9555)
+++ packages/mypaint/trunk/debian/rules	2013-04-21 20:33:50 UTC (rev 9556)
@@ -10,7 +10,17 @@
 # Program build options
 MYPAINT_SCONSOPTS = enable_openmp=true
 
+# Using the default -O0 would break linkage at runtime. The minimum level of
+# optimization supported by MyPaint 1.1.0 is -O1 due to some unhelpful and
+# non-overridable scons defaults.
+#
+# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704935 cf.
+# http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O1
+endif
 
+
 build: build-arch build-indep
 
 build-arch: build-stamp