[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#950507: qmake cross wrapper should pass QMAKE_STRIP



Package: qt5-qmake
Version: 5.12.5+dfsg-8
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:synthv1

The synthv1 package is one of the few that strips in the upstream build
system using qmake. It currently hard codes strip and should be using
$$QMAKE_STRIP instead. When it does so, it'll continue using the build
architecture strip, because the cross wrapper doesn't pass a host tool
here. Therefore the cross wrapper should also pass QMAKE_STRIP. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru qtbase-opensource-src-5.12.5+dfsg/debian/changelog qtbase-opensource-src-5.12.5+dfsg/debian/changelog
--- qtbase-opensource-src-5.12.5+dfsg/debian/changelog	2020-01-30 22:03:38.000000000 +0100
+++ qtbase-opensource-src-5.12.5+dfsg/debian/changelog	2020-02-02 19:34:30.000000000 +0100
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.12.5+dfsg-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * qmake cross wrapper should pass QMAKE_STRIP. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 02 Feb 2020 19:34:30 +0100
+
 qtbase-opensource-src (5.12.5+dfsg-8) unstable; urgency=medium
 
   * Revert adding alternative qtbase5-gles-dev dependencies:
diff --minimal -Nru qtbase-opensource-src-5.12.5+dfsg/debian/qmake-cross-wrapper.in qtbase-opensource-src-5.12.5+dfsg/debian/qmake-cross-wrapper.in
--- qtbase-opensource-src-5.12.5+dfsg/debian/qmake-cross-wrapper.in	2020-01-30 22:03:38.000000000 +0100
+++ qtbase-opensource-src-5.12.5+dfsg/debian/qmake-cross-wrapper.in	2020-02-02 19:34:26.000000000 +0100
@@ -16,6 +16,7 @@
 	QMAKE_CC=${CC:-@DEB_HOST_GNU_TYPE@-gcc} \
 	QMAKE_CXX=${CXX:-@DEB_HOST_GNU_TYPE@-g++} \
 	QMAKE_LINK=${CXX:-@DEB_HOST_GNU_TYPE@-g++} \
+	QMAKE_STRIP=${STRIP:-@DEB_HOST_GNU_TYPE@-strip} \
 	QMAKE_QMAKE=/usr/bin/@DEB_HOST_GNU_TYPE@-qmake \
 	PKG_CONFIG=@DEB_HOST_GNU_TYPE@-pkg-config \
 	-before \

Reply to: