diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2017-11-07 15:14:02 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2017-11-07 15:14:02 +0300 |
| commit | a3ab427f04c1486630b517f5d3060157ccb02b90 (patch) | |
| tree | 4a1ef5eb644734d202a9c56e4f077fe94bf76ad3 | |
| parent | 019bde51b958fb7768830dd278fb1405d4b2e7e7 (diff) | |
| download | qtbase-a3ab427f04c1486630b517f5d3060157ccb02b90.tar.gz | |
Ship two helper files needed for cross-building in qt5-qmake.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/qt5-qmake.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 18 |
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b388b4e..c55cc8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ qtbase-opensource-src (5.9.2+dfsg-5) UNRELEASED; urgency=medium + [ Dmitry Shachnev ] + * Ship /usr/lib/${DEB_HOST_MULTIARCH}/qt.conf in qt5-qmake, it will be used + by debhelper for cross-building. + * Ship /usr/bin/${DEB_HOST_GNU_TYPE}-qmake wrapper script in qt5-qmake, for + using qmake with autoconf and AC_CHECK_TOOL. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 07 Nov 2017 13:57:18 +0300 diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install index 7e73083..c00a21e 100644 --- a/debian/qt5-qmake.install +++ b/debian/qt5-qmake.install @@ -1 +1,3 @@ +usr/bin/*-qmake usr/lib/*/qt5/mkspecs/ +usr/lib/*/qt5/qmake.conf diff --git a/debian/rules b/debian/rules index 1aa2757..88b76b3 100755 --- a/debian/rules +++ b/debian/rules @@ -254,6 +254,24 @@ endif -regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \ -exec chmod a-x {} \; + # Helper files for cross-building + echo "[Paths]" > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "Prefix=/usr" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "HostData=lib/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "HostBinaries=lib/qt5/bin" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "Headers=include/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + + 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)"' \ + "PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \ + '"$$@"' \ + >> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake + chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake + override_dh_auto_install-indep: dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs |