diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-09-18 19:02:50 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2016-09-18 19:14:02 +0000 |
| commit | 23149c7a7f834305df2dec3186a48cbe534b19db (patch) | |
| tree | 58ffa4bc6c19e21a5656bdf62883391795916fc0 | |
| parent | 99bc1c5d8c9911e90975f391b0d16ca03af5a196 (diff) | |
| download | debhelper-23149c7a7f834305df2dec3186a48cbe534b19db.tar.gz | |
cmake.pm: Set pkg-config and LIBDIR when cross-building
Co-Author: Helmut Grohne <helmut@subdivi.de>
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | Debian/Debhelper/Buildsystem/cmake.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index 98631e7e..cce9e350 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 1a8e664f..b4446c38 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@thykier.net> Wed, 14 Sep 2016 06:07:02 +0000 |