[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-4-3-gcb843d8
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Nov 9 10:33:20 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=cb843d8
The following commit has been merged in the master branch:
commit cb843d8369c2c78a8d795076c98cd5018ed255d5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Nov 9 13:28:38 2017 +0300
Minor fixes for the previous commit.
Support overriding CC and CXX, use single quotes for readability.
---
debian/rules | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 88b76b3..43bbcd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -264,9 +264,9 @@ endif
echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
echo "exec /usr/lib/qt5/bin/qmake" \
"-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
- "QMAKE_CC=$(DEB_HOST_GNU_TYPE)-gcc" \
- "QMAKE_CXX=$(DEB_HOST_GNU_TYPE)-g++" \
- 'QMAKE_LINK="\$$(CXX)"' \
+ 'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
+ 'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
+ "QMAKE_LINK='\$$(CXX)'" \
"PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
'"$$@"' \
>> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
--
qtbase packaging
More information about the pkg-kde-commits
mailing list