[debhelper-devel] [debhelper] 01/01: cmake: Pass -DCMAKE_INSTALL_RUNSTATEDIR=/run [c11]

[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 b8d0f323ff465ff3b884d1e93a6c4cf475430301
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jul 29 08:38:28 2017 +0000

    cmake: Pass -DCMAKE_INSTALL_RUNSTATEDIR=/run [c11]
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 4 ++++
 debhelper.pod                         | 9 +++++++++
 debian/changelog                      | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index e1e901c..6060f23 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -56,6 +56,10 @@ sub configure {
 	# Standard set of cmake flags
 	my @flags = @STANDARD_CMAKE_FLAGS;
 
+	if (not compat(10)) {
+		push(@flags, '-DCMAKE_INSTALL_RUNSTATEDIR=/run');
+	}
+
 	if (is_cross_compiling()) {
 		my $deb_host = dpkg_architecture_value("DEB_HOST_ARCH_OS");
 		if (my $cmake_system = $DEB_HOST2CMAKE_SYSTEM{$deb_host}) {
diff --git a/debhelper.pod b/debhelper.pod
index 1f35ff4..54142da 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -632,6 +632,15 @@ F<./configure>.
 
 =item -
 
+The B<cmake> buildsystem now passes
+B<-DCMAKE_INSTALL_RUNSTATEDIR=/run> to L<cmake(1)>.
+
+B<Caveat>: This option silently does nothing in cmake versions prior
+to 3.8.  Please keep this in mind if your package is regularly
+backported (e.g. to stretch-backports) where cmake is older than 3.8.
+
+=item -
+
 B<dh_installman> will now prefer detecting the language from the
 path name rather than the extension.
 
diff --git a/debian/changelog b/debian/changelog
index 3ae0864..61e3f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ debhelper (10.7) UNRELEASED; urgency=medium
     dbgsym packages instead of using xz -1e.  The current default (xz -6)
     is likely to be a better default value for dbgsym packages.  Thanks to
     Adrian Bunk for the suggestion.  (Closes: #868674)
+  * cmake.pm: Pass -DCMAKE_INSTALL_RUNSTATEDIR=/run to cmake in compat 11.
+    Thanks to Felix Geyer for the suggestion.  (Closes: #869697)
 
   [ Colin Watson ]
   * Quote assignment to $recommended_compat in case it isn't a valid Perl

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