Source: debhelper
Version: 10.9.1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:gtk2-engines-oxygen
cmake has two mechanisms for using pkg-config. The current one is
FindPkgConfig.cmake and uses the variable PKG_CONFIG_EXECUTABLE. An
older one is UsePkgConfig.cmake and uses the variable
PKGCONFIG_EXECUTABLE. Since debhelper sets the former, but not the
latter, packages that use UsePkgConfig.cmake (such as
gtk2-engines-oxygen) fail to use the right pkg-config. I think debhelper
should simply set both. Please consider applying the attached patch.
Helmut
diff --minimal -Nru debhelper-10.9.1/debian/changelog
debhelper-10.9.1+nmu1/debian/changelog
--- debhelper-10.9.1/debian/changelog 2017-10-10 21:01:00.000000000 +0200
+++ debhelper-10.9.1+nmu1/debian/changelog 2017-10-13 23:39:36.000000000
+0200
@@ -1,3 +1,11 @@
+debhelper (10.9.1+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * cmake buildsystem: Also supply PKGCONFIG_EXECUTABLE for obsolete
+ UsePkgConfig.cmake. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 13 Oct 2017 23:39:36 +0200
+
debhelper (10.9.1) unstable; urgency=medium
[ Niels Thykier ]
diff --minimal -Nru debhelper-10.9.1/lib/Debian/Debhelper/Buildsystem/cmake.pm
debhelper-10.9.1+nmu1/lib/Debian/Debhelper/Buildsystem/cmake.pm
--- debhelper-10.9.1/lib/Debian/Debhelper/Buildsystem/cmake.pm 2017-09-17
15:41:53.000000000 +0200
+++ debhelper-10.9.1+nmu1/lib/Debian/Debhelper/Buildsystem/cmake.pm
2017-10-13 23:39:34.000000000 +0200
@@ -81,6 +81,7 @@
push @flags, "-DCMAKE_CXX_COMPILER=" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++";
}
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, "-DCMAKE_INSTALL_LIBDIR=lib/" .
dpkg_architecture_value("DEB_HOST_MULTIARCH"));
}
