[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: t: Fix FTBFS with Perl 5.22



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

nthykier pushed a commit to branch master
in repository lintian.

commit e162f2d0299d065d12d22a39ff125319501e4ef1
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Sep 11 16:06:22 2015 +0200

    t: Fix FTBFS with Perl 5.22
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 debian/changelog                                 | 3 +++
 t/tests/rules-perl-makemaker/debian/debian/rules | 5 ++++-
 t/tests/rules-perl-makemaker/tags                | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cb53ae..0a887d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,9 @@ lintian (2.5.37) UNRELEASED; urgency=medium
     + [AB] Fix FTBFS in perlcritic runner with Test::Perl::Critic 1.03
   * t/tests/application-not-library/debian/debian/control.in:
     + [AB] Add a false positive test for libapp-perl-package-name.
+  * t/tests/rules-perl-makemaker/debian/debian/rules:
+    + [NT] Pass DESTDIR to MakeMaker to avoid FTBFS with Perl 5.22.
+      Thanks to Dominic Hargreaves for the report.  (Closes: #797600)
 
  -- Bastien Roucariès <roucaries.bastien+debian@gmail.com>  Sat, 15 Aug 2015 23:49:50 +0200
 
diff --git a/t/tests/rules-perl-makemaker/debian/debian/rules b/t/tests/rules-perl-makemaker/debian/debian/rules
index 1dac786..95a2323 100755
--- a/t/tests/rules-perl-makemaker/debian/debian/rules
+++ b/t/tests/rules-perl-makemaker/debian/debian/rules
@@ -6,6 +6,9 @@ PERL ?= /usr/bin/perl
 
 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
+EMPTY   =
+FOO     = DEST
+INDIRECT_DEST_VAR = $(FOO)DIR=$(TMP)
 
 configure: configure-stamp
 configure-stamp:
@@ -43,7 +46,7 @@ install: build
 	dh_prep
 	dh_installdirs
 
-	$(MAKE) install PREFIX=$(TMP)/usr
+	$(MAKE) install PREFIX=$(EMPTY)/usr $(INDIRECT_DEST_VAR)
 
 	# Remove any empty directories
 	find $(TMP)/usr -type d -empty -print0 | xargs --no-run-if-empty --null rmdir -p --ignore-fail-on-non-empty
diff --git a/t/tests/rules-perl-makemaker/tags b/t/tests/rules-perl-makemaker/tags
index 085b0de..97e3231 100644
--- a/t/tests/rules-perl-makemaker/tags
+++ b/t/tests/rules-perl-makemaker/tags
@@ -1 +1 @@
-W: rules-perl-makemaker source: debian-rules-makemaker-prefix-is-deprecated line 46
+W: rules-perl-makemaker source: debian-rules-makemaker-prefix-is-deprecated line 49

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


Reply to: