[debhelper-devel] [debhelper] 02/03: Phase out perl -I. in compat 11

Niels Thykier nthykier at moszumanska.debian.org
Thu Jun 29 16:07:06 UTC 2017


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit e912bd8a6418a8ae1d2e1f5bcd57015f5c6eb1cd
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 28 09:43:12 2017 +0000

    Phase out perl -I. in compat 11
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/perl_build.pm     | 5 +++--
 Debian/Debhelper/Buildsystem/perl_makemaker.pm | 6 ++++--
 debhelper.pod                                  | 7 +++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 2d3e4ef..45874df 100644
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -41,7 +41,7 @@ sub new {
 
 sub configure {
 	my $this=shift;
-	my @flags;
+	my (@flags, @perl_flags);
 	$ENV{PERL_MM_USE_DEFAULT}=1;
 	if ($ENV{CFLAGS} && ! compat(8)) {
 		push @flags, "--config", "optimize=$ENV{CFLAGS} $ENV{CPPFLAGS}";
@@ -49,7 +49,8 @@ sub configure {
 	if ($ENV{LDFLAGS} && ! compat(8)) {
 		push @flags, "--config", "ld=$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}";
 	}
-	$this->do_perl("-I.", "Build.PL", "--installdirs", "vendor", @flags, @_);
+	push(@perl_flags, '-I.') if compat(10);
+	$this->do_perl(@perl_flags, "Build.PL", "--installdirs", "vendor", @flags, @_);
 }
 
 sub build {
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index a3a57c5..30e4f10 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -41,7 +41,7 @@ sub new {
 
 sub configure {
 	my $this=shift;
-	my @flags;
+	my (@flags, @perl_flags);
 	# If set to a true value then MakeMaker's prompt function will
 	# # always return the default without waiting for user input.
 	$ENV{PERL_MM_USE_DEFAULT}=1;
@@ -55,7 +55,9 @@ sub configure {
 		push @flags, "LD=$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}";
 	}
 
-	$this->doit_in_sourcedir("perl", "-I.", "Makefile.PL", "INSTALLDIRS=vendor",
+	push(@perl_flags, '-I.') if compat(10);
+
+	$this->doit_in_sourcedir("perl", @perl_flags, "Makefile.PL", "INSTALLDIRS=vendor",
 		# if perl_build is not tested first, need to pass packlist
 		# option to handle fallthrough case
 		(compat(7) ? "create_packlist=0" : ()),
diff --git a/debhelper.pod b/debhelper.pod
index 0b3f202..f0770e1 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -678,6 +678,13 @@ F<debian/tmp> like B<dh_install>.
 
 =item -
 
+The B<perl-makemaker> and B<perl-build> build systems no longer pass
+B<-I.> to perl.  Packages that still need this behaviour can get
+emulate it by using the B<PERL5LIB> environment variable.  E.g. by
+adding B<export PERL5LIB=.> in their debian/rules file (or similar).
+
+=item -
+
 The B<PERL_USE_UNSAFE_INC> environment variable is no longer set by
 B<dh> or any of the B<dh_auto_*> tools.  It was added as a temporary
 work around to avoid a lot of packages failing to build at the same

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




More information about the debhelper-devel mailing list