diff options
| author | Niels Thykier <niels@thykier.net> | 2017-02-18 18:07:30 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2017-02-18 18:07:30 +0000 |
| commit | c5ebf579812250a21862de74a39464f2f58f1f08 (patch) | |
| tree | fbab699419679236b018d5584724d07d7f27a4cc | |
| parent | 68cc5f58ef61a74c78e5337bd836c7cc3670147d (diff) | |
| download | debhelper-c5ebf579812250a21862de74a39464f2f58f1f08.tar.gz | |
makefile.pm: Disable stripping via INSTALL in compat 11
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | Debian/Debhelper/Buildsystem/makefile.pm | 8 | ||||
| -rw-r--r-- | debhelper.pod | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm index 42b184e4..f66b9e04 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 c9a3739e..4cac38c2 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 8b5cf60c..295a82b8 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@subdivi.de> Sat, 18 Feb 2017 17:49:08 +0000 |