From 2c0c402c9d1c3a8ef9fe4c9951a4dcbe0c1b183e Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 10 Oct 2007 02:56:39 +0300 Subject: [PATCH] Use shipped perl modules when calling perl programs at build time --- ChangeLog | 6 ++++++ debian/changelog | 3 +++ m4/arch.m4 | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5cadbafc..a25b33f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-10 Guillem Jover + + * 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 * 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 -- 2.39.5