[debhelper-devel] [debhelper] 01/01: cmake.pm: Set pkg-config and LIBDIR when cross-building

[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 23149c7a7f834305df2dec3186a48cbe534b19db
Author: Julian Andres Klode <jak at debian.org>
Date:   Sun Sep 18 19:02:50 2016 +0000

    cmake.pm: Set pkg-config and LIBDIR when cross-building
    
    Co-Author: Helmut Grohne <helmut at subdivi.de>
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 2 ++
 debian/changelog                      | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 98631e7..cce9e35 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -74,6 +74,8 @@ sub configure {
 		} else {
 			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, "-DCMAKE_INSTALL_LIBDIR=lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH"));
 	}
 
 	# CMake doesn't respect CPPFLAGS, see #653916.
diff --git a/debian/changelog b/debian/changelog
index 1a8e664..b4446c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debhelper (10+unreleased) UNRELEASED; urgency=medium
   * Apply patch from Michael Biebl to take over dh-systemd
     package to ease backporting to jessie-backports.
     (Closes: #837585)
+  * Apply patch from Helmut Grohne and Julian Andres Klode
+    to improve cross-building support in the cmake build
+    system.  (Closes: #833789)
 
  -- Niels Thykier <niels at thykier.net>  Wed, 14 Sep 2016 06:07:02 +0000
 

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