[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-35-g4e1ab1f

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 09da4c0b4f2f0bd7a805664ce411d46e20604744
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Sep 1 12:09:37 2013 -0300

    Pass the necessary flags by hand.
---
 debian/changelog |    1 +
 debian/rules     |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8bc3bce..602bfcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ qtcreator (2.8.1-1) UNRELEASED; urgency=low
   * Adjust install files.
   * Manually call qmake in order to avoid a FTBFS due to dh passing -nocache.
     Upstream uses caches to put default data for building, so we need them.
+    Pass the necessary flags by hand.
   * Remove arch-specific files from /usr/share until upstream bug
     https://bugreports.qt-project.org/browse/QTCREATORBUG-10074 is solved.
 
diff --git a/debian/rules b/debian/rules
index 2969610..e63a589 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,12 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export QMAKE_CFLAGS_RELEASE := $(CFLAGS)
+export QMAKE_CFLAGS_DEBUG := $(CFLAGS)
+export QMAKE_CXXFLAGS_RELEASE := $(CXXFLAGS)
+export QMAKE_CXXFLAGS_DEBUG := $(CXXFLAGS)
+export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
+export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt4
 
 # Upstream changelog
@@ -18,7 +24,16 @@ upstream_changes := $(wildcard dist/changes-*)
 
 override_dh_auto_configure:
 	mkdir -p builddir
-	cd builddir ; qmake $(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
+	cd builddir ; \
+		qmake QMAKE_CFLAGS_RELEASE="$(QMAKE_CFLAGS_RELEASE)" \
+		QMAKE_CFLAGS_DEBUG="$(QMAKE_CFLAGS_DEBUG)" \
+		QMAKE_CXXFLAGS_RELEASE="$(QMAKE_CXXFLAGS_RELEASE)" \
+		QMAKE_CXXFLAGS_DEBUG="$(QMAKE_CXXFLAGS_DEBUG)" \
+		QMAKE_LFLAGS_RELEASE="$(QMAKE_LFLAGS_RELEASE)" \
+		QMAKE_LFLAGS_DEBUG="$(QMAKE_LFLAGS_DEBUG)" \
+		QMAKE_STRIP=: \
+		PREFIX=/usr/ \
+		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
 override_dh_auto_install:
 ifneq (,$(filter qtcreator-doc, $(shell dh_listpackages)))

-- 
qtcreator packaging