[Reproducible-commits] [dpkg] 33/105: build: Do not require passing the perl interpreter to run-script

[Niko Tyni]

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

ntyni pushed a commit to branch ntyni/reproducible_builds
in repository dpkg.

commit fb391b608a5bb9eda6bbb79674083e75425ab195
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Mar 29 02:10:09 2016 +0200

    build: Do not require passing the perl interpreter to run-script
    
    We will try to use the PERL environment variable or fallback to use perl
    for the scripts interpreter.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 m4/dpkg-arch.m4  | 2 +-
 run-script       | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9b37c4..3538402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
     - Make it possible to build without system libmd.
     - Add a configuration summary to configure output.
     - Make git log invocation immune to local configuration.
+    - Do not require passing the perl interpreter to run-script.
   * Test suite:
     - Add a unit test to compile perl code with warnings.
     - Add a unit test for the trigger deferred parser.
diff --git a/debian/rules b/debian/rules
index 6a54c6c..bc371d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ dpkg_buildflags = \
 	$(if $(call cc_version_lt,4.9),$(hardening_old)) \
 	DEB_CFLAGS_MAINT_APPEND="$(WFLAGS)" \
 	DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" \
-	$(CURDIR)/run-script perl scripts/dpkg-buildflags.pl
+	$(CURDIR)/run-script scripts/dpkg-buildflags.pl
 
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4
index 58d6580..aae223a 100644
--- a/m4/dpkg-arch.m4
+++ b/m4/dpkg-arch.m4
@@ -8,7 +8,7 @@
 AC_DEFUN([_DPKG_ARCHITECTURE], [
 AC_REQUIRE([DPKG_PROG_PERL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
-$2=$($srcdir/run-script $PERL scripts/dpkg-architecture.pl -t$host -q$1 2>/dev/null)
+$2=$(PERL=$PERL $srcdir/run-script scripts/dpkg-architecture.pl -t$host -q$1 2>/dev/null)
 ])# _DPKG_ARCHITECURE
 
 # DPKG_CPU_TYPE
diff --git a/run-script b/run-script
index b6c6a75..3e20e39 100755
--- a/run-script
+++ b/run-script
@@ -9,11 +9,11 @@ cwd="`pwd`"
 cd "$OLDPWD"
 
 # Set up the environment, to use local perl modules and data files.
+export PERL="${PERL:-perl}"
 export PERL5LIB="$cwd/scripts:$cwd/dselect/methods"
 export DPKG_DATADIR="$cwd"
 
-interp="$1"
-script="$2"
-shift 2
+script="$1"
+shift 1
 
-exec $interp "$cwd/$script" "$@"
+exec $PERL "$cwd/$script" "$@"

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