Source: debhelper
Version: 11.5.1
Tags: patch
User: [email protected]
Usertags: rebootstrap
Control: affects -1 + src:akonadi-contacts src:akonadi-mime src:akonadi-notes
src:akonadi-search src:ark src:attica-kf5 src:baloo-kf5 src:bluedevil
src:bluez-qt src:dolphin src:dragon src:k3b src:frameworkintegration
src:kaccounts-integration src:kactivities-kf5 src:kactivities-stats
src:kaddressbook src:kamera src:karchive src:kauth src:kbookmarks src:kcalutils
src:kcmutils src:kcodecs src:kcompletion src:kconfigwidgets src:kcoreaddons
src:kcontacts src:kcrash src:kdbusaddons src:kdeclarative
src:kdegraphics-mobipocket src:kdepim-runtime src:kdesu src:kdnssd-kf5
src:kemoticons src:kf5-messagelib src:kfilemetadata-kf5 src:kgamma5
src:kglobalaccel src:kguiaddons src:kholidays src:khtml src:kiconthemes
src:kidentitymanagement src:kidletime src:kimap src:kinfocenter src:kio
src:kitemmodels src:kitemviews src:kjobwidgets src:kjsembed src:kldap src:kmail
src:kmailtransport src:kmbox src:kmime src:knewstuff src:knotes
src:knotifications src:knotifyconfig src:konqueror src:konsole
src:kontactinterface src:korganizer src:kparts src:kpeople src:kpty src:kross
src:krunner src:kscreen src:kscreenlocker src:kservice src:ktextwidgets
src:kunitconversion src:kwallet-kf5 src:kwalletmanager src:kwayland
src:kwidgetsaddons src:kwin src:kwindowsystem src:kwrited src:kxmlgui
src:kxmlrpcclient src:libkcddb src:libkcompactdisc src:libkf5grantleetheme
src:libkf5libkleo src:libkscreen src:modemmanager-qt src:networkmanager-qt
src:okular src:plasma-framework src:plasma-integration src:plasma-nm
src:sddm-kcm src:threadweaver
I noticed that a number of packages would install stuff into
/usr/lib/${DEB_BUILD_MULTIARCH}. I guess around 150 packages are
affected and the affects are just examples. They tend to use cmake and
KDEInstallDirs.cmake from extra-cmake-modules. That in turn uses a macro
query_qmake to query qmake for paths. It happens to use the build
architecture qmake unless you specify QMAKE_EXECUTABLE. So fixing the
mess involves adding that variable. Please consider applying the
attached patch.
Helmut
diff --minimal -Nru debhelper-11.5.1/debian/changelog
debhelper-11.5.1+nmu1/debian/changelog
--- debhelper-11.5.1/debian/changelog 2018-10-31 22:02:00.000000000 +0100
+++ debhelper-11.5.1+nmu1/debian/changelog 2018-11-09 20:03:20.000000000
+0100
@@ -1,3 +1,10 @@
+debhelper (11.5.1+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * cmake buildsystem: Pass QMAKE_EXECUTABLE for cross. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Fri, 09 Nov 2018 20:03:20 +0100
+
debhelper (11.5.1) unstable; urgency=medium
* dh_systemd_start: Fix bug introduced in debhelper/11.5 where
diff --minimal -Nru debhelper-11.5.1/lib/Debian/Debhelper/Buildsystem/cmake.pm
debhelper-11.5.1+nmu1/lib/Debian/Debhelper/Buildsystem/cmake.pm
--- debhelper-11.5.1/lib/Debian/Debhelper/Buildsystem/cmake.pm 2018-10-24
20:30:33.000000000 +0200
+++ debhelper-11.5.1+nmu1/lib/Debian/Debhelper/Buildsystem/cmake.pm
2018-11-09 20:03:18.000000000 +0100
@@ -110,6 +110,7 @@
}
push(@flags, "-DPKG_CONFIG_EXECUTABLE=/usr/bin/" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config");
push(@flags, "-DPKGCONFIG_EXECUTABLE=/usr/bin/" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config");
+ push(@flags, "-DQMAKE_EXECUTABLE=/usr/bin/" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-qmake");
}
push(@flags, "-DCMAKE_INSTALL_LIBDIR=lib/" .
dpkg_architecture_value("DEB_HOST_MULTIARCH"));
