[debhelper-devel] [debhelper] 01/01: makefile.pm: Disable stripping via INSTALL in compat 11

[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 c5ebf579812250a21862de74a39464f2f58f1f08
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Feb 18 18:07:30 2017 +0000

    makefile.pm: Disable stripping via INSTALL in compat 11
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/makefile.pm | 8 +++++++-
 debhelper.pod                            | 6 ++++++
 debian/changelog                         | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index 42b184e..f66b9e0 100644
--- a/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/Debian/Debhelper/Buildsystem/makefile.pm
@@ -8,7 +8,7 @@ package Debian::Debhelper::Buildsystem::makefile;
 
 use strict;
 use warnings;
-use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value escape_shell clean_jobserver_makeflags is_cross_compiling);
+use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value escape_shell clean_jobserver_makeflags is_cross_compiling compat);
 use parent qw(Debian::Debhelper::Buildsystem);
 
 my %DEB_DEFAULT_TOOLS = (
@@ -142,6 +142,9 @@ sub build {
 			}
 		}
 	}
+	if (ref($this) eq 'Debian::Debhelper::Buildsystem::makefile' and not compat(10)) {
+		unshift @_, "INSTALL=install --strip-program=true";
+	}
 	$this->do_make(@_);
 }
 
@@ -153,6 +156,9 @@ sub test {
 sub install {
 	my $this=shift;
 	my $destdir=shift;
+	if (ref($this) eq 'Debian::Debhelper::Buildsystem::makefile' and not compat(10)) {
+		unshift @_, "INSTALL=install --strip-program=true";
+	}
 	$this->make_first_existing_target(['install'],
 		"DESTDIR=$destdir",
 		"AM_UPDATE_INFO_DIR=no", @_);
diff --git a/debhelper.pod b/debhelper.pod
index c9a3739..4cac38c 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -632,6 +632,12 @@ expect.
 
 The previous behaviour can restored by using B<--with build-stamp>
 
+=item -
+
+The B<makefile> buildsystem now passes B<INSTALL=install
+--strip-program=true> to L<make(1)>.  Derivative buildsystems
+(e.g. B<configure> or B<cmake>) are unaffected by this change.
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 8b5cf60..295a82b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debhelper (10.2.6) UNRELEASED; urgency=medium
 
   * Supply PKG_CONFIG for cross compilation with the makefile buildsystem.
     (Closes: #853881)
+  * Disable stripping during dh_auto_* in makefile buildsystem in compat 11.
+    (Closes: #844077)
 
  -- Helmut Grohne <helmut at subdivi.de>  Sat, 18 Feb 2017 17:49:08 +0000
 

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