Use shipped perl modules when calling perl programs at build time

diff --git a/ChangeLog b/ChangeLog
index 5cadbafc191a7fced240a462da053f143b9e989d..a25b33f9b3526a83dce232487f586bead5565cc8 100644 (file)
--- 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 8abbda3f7d517bdd1af2b360155bc5f762315c30..7e2233578cf8374af42adf515a53d7633bf88df3 100644 (file)
--- 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 59c1364181ace80b3df5b85bc667fcd8f8f6c32d..e6f242a0bb0d2d336758ad8ceca903124ca03735 100644 (file)
--- 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