summaryrefslogtreecommitdiff
path: root/Debian/Debhelper
diff options
context:
space:
mode:
Diffstat (limited to 'Debian/Debhelper')
-rw-r--r--Debian/Debhelper/Buildsystem/perl_build.pm1
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm7
-rw-r--r--Debian/Debhelper/Buildsystem/python_distutils.pm4
-rw-r--r--Debian/Debhelper/Dh_Buildsystems.pm3
-rw-r--r--Debian/Debhelper/Dh_Getopt.pm8
-rw-r--r--Debian/Debhelper/Dh_Lib.pm3
6 files changed, 19 insertions, 7 deletions
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 2afa5e5..deb9a37 100644
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -26,7 +26,6 @@ sub check_auto_buildable {
sub do_perl {
my $this=shift;
- $ENV{MODULEBUILDRC} = "/dev/null";
$this->doit_in_sourcedir("perl", @_);
}
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index b2500ab..72f8d8c 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -7,6 +7,7 @@
package Debian::Debhelper::Buildsystem::perl_makemaker;
use strict;
+use Debian::Debhelper::Dh_Lib qw(compat);
use base 'Debian::Debhelper::Buildsystem::makefile';
sub DESCRIPTION {
@@ -45,8 +46,10 @@ sub configure {
$ENV{PERL_AUTOINSTALL}="--skipdeps";
$this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",
- "create_packlist=0",
- @_);
+ # if perl_build is not tested first, need to pass packlist
+ # option to handle fallthrough case
+ (compat(7) ? "create_packlist=0" : ()),
+ @_);
}
sub install {
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 70307b0..5115a8a 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -163,7 +163,9 @@ sub setup_py {
sub build {
my $this=shift;
- $this->setup_py("build", @_);
+ $this->setup_py("build",
+ "--force",
+ @_);
}
sub install {
diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index a14ff03..22f80f9 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -20,10 +20,11 @@ use constant BUILD_STEPS => qw(configure build test install clean);
# build systems MUST be added to the END of the list.
our @BUILDSYSTEMS = (
"autoconf",
+ (! compat(7) ? "perl_build" : ()),
"perl_makemaker",
"makefile",
"python_distutils",
- "perl_build",
+ (compat(7) ? "perl_build" : ()),
"cmake",
"ant",
"qmake",
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 257fe64..e4f3e47 100644
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -236,7 +236,9 @@ sub parseopts {
if ($dh{DOINDEP} || $dh{DOARCH}) {
# User specified that all arch (in)dep package be
# built, and there are none of that type.
- warning("You asked that all arch in(dep) packages be built, but there are none of that type.");
+ if (! $dh{BLOCK_NOOP_WARNINGS}) {
+ warning("You asked that all arch in(dep) packages be built, but there are none of that type.");
+ }
exit(0);
}
push @{$dh{DOPACKAGES}},getpackages("both");
@@ -263,7 +265,9 @@ sub parseopts {
@{$dh{DOPACKAGES}}=@package_list;
if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) {
- warning("No packages to build.");
+ if (! $dh{BLOCK_NOOP_WARNINGS}) {
+ warning("No packages to build.");
+ }
exit(0);
}
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 63d1f65..fb83480 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -125,6 +125,8 @@ sub write_log {
my $cmd=shift;
my @packages=@_;
+ return if defined $ENV{DH_INHIBIT_LOG} && $cmd eq $ENV{DH_INHIBIT_LOG};
+
foreach my $package (@packages) {
my $ext=pkgext($package);
my $log="debian/${ext}debhelper.log";
@@ -215,6 +217,7 @@ sub xargs {
# The kernel can accept command lines up to 20k worth of characters.
my $command_max=20000; # LINUX SPECIFIC!!
+ # (And obsolete; it's bigger now.)
# I could use POSIX::ARG_MAX, but that would be slow.
# Figure out length of static portion of command.