Source: qtcreator
Version: 4.5.2-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Please use dh_auto_configure for building qtcreator. The attached patch
demonstrates that doing so vastly simplifies the packaging. It also
improves cross compilation a little and enables us to fix the remaining
issues in debhelper or qmake.
Helmut
diff --minimal -Nru qtcreator-4.5.2/debian/changelog
qtcreator-4.5.2/debian/changelog
--- qtcreator-4.5.2/debian/changelog 2018-03-17 20:12:32.000000000 +0100
+++ qtcreator-4.5.2/debian/changelog 2018-03-19 14:37:33.000000000 +0100
@@ -1,3 +1,10 @@
+qtcreator (4.5.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use dh_auto_configure. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 19 Mar 2018 14:37:33 +0100
+
qtcreator (4.5.2-1) unstable; urgency=medium
[ Simon Quigley ]
diff --minimal -Nru qtcreator-4.5.2/debian/rules qtcreator-4.5.2/debian/rules
--- qtcreator-4.5.2/debian/rules 2018-03-17 17:26:40.000000000 +0100
+++ qtcreator-4.5.2/debian/rules 2018-03-19 14:37:33.000000000 +0100
@@ -5,15 +5,6 @@
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 := qt5
export LLVM_INSTALL_DIR := $(shell if [ -d /usr/lib/llvm-3.9 ]; then echo
/usr/lib/llvm-3.9; fi)
@@ -24,17 +15,9 @@
dh $@ --builddirectory=builddir
override_dh_auto_configure:
- mkdir -p builddir
- cd builddir ; \
- 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)" \
- QMAKE_LFLAGS_RELEASE="$(QMAKE_LFLAGS_RELEASE)" \
- QMAKE_LFLAGS_DEBUG="$(QMAKE_LFLAGS_DEBUG)" \
- QMAKE_STRIP=: \
+ dh_auto_configure -- \
+ -recursive \
QBS_INSTALL_DIR=/usr \
- PREFIX=/usr/ \
LLVM_INSTALL_DIR="$(LLVM_INSTALL_DIR)" \
USE_SYSTEM_BOTAN=1 \
CONFIG+=disable_external_rpath \
