[debhelper-devel] [debhelper] 01/01: cmake.pm: Also supply PKGCONFIG_EXECUTABLE for obsolete UsePkgConfig.cmake

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 702519482f0ef408e5528b9332a71476af5f4f87
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Sat Oct 14 06:22:29 2017 +0000

    cmake.pm: Also supply PKGCONFIG_EXECUTABLE for obsolete UsePkgConfig.cmake
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog                          | 4 ++++
 lib/Debian/Debhelper/Buildsystem/cmake.pm | 1 +
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e64ae6e..da5bdb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ debhelper (10.9.2) UNRELEASED; urgency=medium
   * dh_systemd_enable: Remove as obsolete in compat 11.
   * dh_systemd_start: Ditto.
 
+  [ Helmut Grohne ]
+  * cmake.pm: Also supply PKGCONFIG_EXECUTABLE for obsolete
+    UsePkgConfig.cmake.  (Closes: #878460)
+
  -- Niels Thykier <niels at thykier.net>  Wed, 11 Oct 2017 05:32:09 +0000
 
 debhelper (10.9.1) unstable; urgency=medium
diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm
index a73cac1..5e3ce08 100644
--- a/lib/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm
@@ -81,6 +81,7 @@ sub configure {
 			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"));
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git