Package: perl
Version: 5.10.1-17
Severity: normal
Tags: patch
User: [email protected]
Usertags: multiarch

Hi folks,

Please consider applying the attached patch to perl in Debian; this (or
something like it) is needed to let perl build on a system whose libraries
are converted to use the multiarch directories.  Since this transition is
expected to start in Debian unstable as soon as dpkg 1.16.0 is uploaded, it
would be great if perl could be fixed for this early.

This patch will be uploaded shortly to Ubuntu with the following
explanation in the changelog:

  * debian/config.debian: pass multiarch paths to the build (if 
    available) so that we're able to find libraries needed to build.
    LP: #739693.

It is safe to apply this change in advance of the dpkg 1.16.0 upload.  With
a pre-multiarch dpkg, dpkg-architecture -qDEB_HOST_MULTIARCH returns nothing
and the build should proceed normally, ignoring these dirs.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
[email protected]                                     [email protected]
diff -Nru perl-5.10.1/debian/config.debian perl-5.10.1/debian/config.debian
--- perl-5.10.1/debian/config.debian	2011-02-11 10:07:36.000000000 -0800
+++ perl-5.10.1/debian/config.debian	2011-03-30 13:51:34.000000000 -0700
@@ -10,6 +10,7 @@
 ccflags=-DDEBIAN
 arch_cpu=${DEB_BUILD_ARCH_CPU:-$(dpkg-architecture -qDEB_BUILD_ARCH_CPU)}
 gnu_type=${DEB_BUILD_GNU_TYPE:-$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)}
+multiarch_dir=${DEB_HOST_MULTIARCH:-$(dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)}
 optimize=-O2
 debugging=-g
 
@@ -80,6 +81,10 @@
 	optimize="$optimize${optimize:+ }-O0";;
 esac
 
+if [ -n "$multiarch_dir" ]; then
+	extra_path="\"-Dplibpth=/lib/$multiarch_dir /usr/lib/$multiarch_dir\""
+fi
+
 # post-configure tweaks
 cp debian/config.over .
 
@@ -113,4 +118,5 @@
     -Uusenm					\
     -DDEBUGGING=$debugging			\
     -Doptimize=\"$optimize\"			\
+    $extra_path					\
     $opts -des

Reply via email to