From: Guillem Jover <guillem@debian.org>
Date: Tue, 9 Oct 2007 23:56:39 +0000 (+0300)
Subject: Use shipped perl modules when calling perl programs at build time
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c0c402c9d1c3a8ef9fe4c9951a4dcbe0c1b183e;p=dpkg

Use shipped perl modules when calling perl programs at build time
---

diff --git a/ChangeLog b/ChangeLog
index 5cadbafc..a25b33f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-10  Guillem Jover  <guillem@debian.org>
+
+	* m4/arch.m4(_DPKG_ARCHITECTURE): Set PERL5LIB when calling
+	dpkg-architecture.pl to use the shipped perl modules instead of
+	the system ones.
+
 2007-10-09  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-gensymbols.pl: Use new Dpkg module. Do not declare
diff --git a/debian/changelog b/debian/changelog
index 8abbda3f..7e223357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,9 @@ dpkg (1.14.8) UNRELEASED; urgency=low
   * Various small fixes to the manpages suggested by Helge Kreutzmann.
     Closes: #445858
 
+  [ Guillem Jover ]
+  * Use shipped perl modules when calling perl programs at build time.
+
   [ Updated dpkg translations ]
   * Polish (Robert Luberda).
 
diff --git a/m4/arch.m4 b/m4/arch.m4
index 59c13641..e6f242a0 100644
--- a/m4/arch.m4
+++ b/m4/arch.m4
@@ -4,7 +4,8 @@
 # the target architecture, to avoid duplicating its logic.
 AC_DEFUN([_DPKG_ARCHITECTURE], [
 AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-$2="`cd $srcdir/scripts; ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`"
+$2="`cd $srcdir/scripts; \
+     PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`"
 ])# _DPKG_ARCHITECURE
 
 # DPKG_CPU_TYPE