[SCM] qtcreator packaging branch, master, updated. debian/3.1.1+dfsg-1-7-g3f1d2c9

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=3f1d2c9

The following commit has been merged in the master branch:
commit 3f1d2c94c04a1dab223d18ee87d174e3740ddc2d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Aug 3 13:34:55 2014 -0300

    Hack over a g++ problem while using -O2 on armhf.
    
    Add a horrible hack in debian/rules for building a few files with -O1
    instead of -O2 on armhf. If you don't like this please be sure to help
    me to get a minimal test case in order to fill a proper bug against g++.
---
 debian/changelog |  5 +++++
 debian/rules     | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a3db661..1686f1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ qtcreator (3.1.2+dfsg-2) UNRELEASED; urgency=medium
   [ Adam Majer ]
   * Add Debian menu entry.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add a horrible hack in debian/rules for building a few files with -O1
+    instead of -O2 on armhf. If you don't like this please be sure to help
+    me to get a minimal test case in order to fill a proper bug against g++.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Aug 2014 13:29:22 -0300
 
 qtcreator (3.1.2+dfsg-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 8de9086..1fec6df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_auto_configure:
 
 	mkdir -p builddir
 	cd builddir ; \
-		qmake QMAKE_CFLAGS_RELEASE="$(QMAKE_CFLAGS_RELEASE)" \
+		qmake -recursive QMAKE_CFLAGS_RELEASE="$(QMAKE_CFLAGS_RELEASE)" \
 		QMAKE_CFLAGS_DEBUG="$(QMAKE_CFLAGS_DEBUG)" \
 		QMAKE_CXXFLAGS_RELEASE="$(QMAKE_CXXFLAGS_RELEASE)" \
 		QMAKE_CXXFLAGS_DEBUG="$(QMAKE_CXXFLAGS_DEBUG)" \
@@ -41,6 +41,14 @@ override_dh_auto_configure:
 		PREFIX=/usr/ \
 		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armhf))
+	# Hack over a g++ problem while using -O2 on armhf.
+	# If you don't like this horrible hack please feel free to help me try to
+	# reproduce it in a minimal test case so as to be able to properly fill a
+	# bug against g++.
+	sed -i 's/O2/O1/g' builddir/src/plugins/qmldesigner/Makefile.qmldesignerplugin
+endif
+
 override_dh_auto_install:
 ifneq (,$(filter qtcreator-doc, $(shell dh_listpackages)))
 	dh_auto_build -- qch_docs

-- 
qtcreator packaging