diff --git a/debian/changelog b/debian/changelog index b46c699..ba22442 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ qt6-base (6.4.2+dfsg-1) UNRELEASED; urgency=medium + Depend on a native qt toolchain for the former. + Do build tools even when cross building. + Add excess files to debian/not-installed. + * Install -qmake6 cross wrapper (Closes: #1025663). -- Debian Qt/KDE Maintainers Sat, 21 Jan 2023 13:42:21 +0100 diff --git a/debian/qmake-cross-wrapper.in b/debian/qmake-cross-wrapper.in new file mode 100644 index 0000000..79fcc5c --- /dev/null +++ b/debian/qmake-cross-wrapper.in @@ -0,0 +1,27 @@ +#!/bin/sh + +if [ "x$1" = x-qt6 ] || [ "x$1" = "x-qt=6" ] || [ "x$1" = "x-qt=qt6" ]; then + shift +fi + +QMAKE_MODE= + +if [ "x$1" = x-query ]; then + exec /usr/lib/qt6/bin/qmake "$@" -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf +elif [ "x$1" = x-makefile ] || [ "x$1" = x-project ]; then + QMAKE_MODE="$1" + shift +fi + +exec /usr/lib/qt6/bin/qmake6 \ + $QMAKE_MODE \ + -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt6/qt6.conf \ + -early \ + 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@-qmake6 \ + PKG_CONFIG=@DEB_HOST_GNU_TYPE@-pkg-config \ + -before \ + "$@" diff --git a/debian/qmake6.install b/debian/qmake6.install index a936544..e07f5dc 100644 --- a/debian/qmake6.install +++ b/debian/qmake6.install @@ -1,3 +1,4 @@ +usr/bin/*-qmake6 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/aix-g++-64/qmake.conf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/aix-g++-64/qplatformdefs.h usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/aix-g++/qmake.conf diff --git a/debian/rules b/debian/rules index fe61815..6d992e9 100755 --- a/debian/rules +++ b/debian/rules @@ -97,6 +97,13 @@ execute_after_dh_auto_install: sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' debian/qt.conf.in \ > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/qt6.conf + # Inject cross-wrapper for qmake6 + mkdir -p debian/tmp/usr/bin + sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ + -e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \ + < debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6 + chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6 + override_dh_makeshlibs: dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa