Bug#618840: make-dfsg: make needs to know about multiarch for expansion of -l target dependencies

[Steve Langasek]

Hi Manoj,

As previously indicated, I'm now uploading an NMU for make-dfsg - a few days
later than originally promised.  The full NMU diff with changelog is
attached for your reference.

Thanks,
-- 
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/
slanga...@ubuntu.com                                     vor...@debian.org

diff -u make-dfsg-3.81/remake.c make-dfsg-3.81/remake.c
--- make-dfsg-3.81/remake.c
+++ make-dfsg-3.81/remake.c
@@ -1451,6 +1451,9 @@
 {
   static char *dirs[] =
     {
+#ifdef MULTIARCH_DIRS
+      MULTIARCH_DIRS
+#endif
 #ifndef _AMIGA
       "/lib",
 #endif
diff -u make-dfsg-3.81/configure.in make-dfsg-3.81/configure.in
--- make-dfsg-3.81/configure.in
+++ make-dfsg-3.81/configure.in
@@ -374,6 +374,24 @@
 MAKE_HOST="$host"
 AC_SUBST(MAKE_HOST)
 
+AC_PATH_TOOL([DPKG_ARCH], [dpkg-architecture])
+AC_MSG_CHECKING([for multiarch paths])
+multiarch_triplet=""
+if test -n "$DPKG_ARCH"; then
+	multiarch_triplet=$($DPKG_ARCH -qDEB_HOST_MULTIARCH)
+	if test -z "$multiarch_triplet"; then
+		multiarch_triplet=$($DPKG_ARCH -qDEB_HOST_GNU_TYPE)
+	fi
+fi
+if test -n "$multiarch_triplet"; then
+	MULTIARCH_DIRS="\\\"/lib/$multiarch_triplet\\\", \\\"/usr/lib/$multiarch_triplet\\\","
+	AC_MSG_RESULT([$MULTIARCH_DIRS])
+else
+	AC_MSG_RESULT([not found])
+fi
+
+AC_SUBST(MULTIARCH_DIRS)
+
 w32_target_env=no
 AM_CONDITIONAL([WINDOWSENV], false)
 
diff -u make-dfsg-3.81/debian/changelog make-dfsg-3.81/debian/changelog
--- make-dfsg-3.81/debian/changelog
+++ make-dfsg-3.81/debian/changelog
@@ -1,3 +1,13 @@
+make-dfsg (3.81-8.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * remake.c, configure.in: prepend multiarch paths to the library path in
+    library_search() when we have a target dependency of '-lfoo', so that
+    this still works when all our libraries are moving to multiarch library
+    directories.  Closes: #618840, LP: #737641.
+
+ -- Steve Langasek <vor...@debian.org>  Sat, 09 Apr 2011 19:51:46 +0000
+
 make-dfsg (3.81-8) unstable; urgency=low
 
   * New bug fixing release.
only in patch2:
unchanged:
--- make-dfsg-3.81.orig/Makefile.am
+++ make-dfsg-3.81/Makefile.am
@@ -57,7 +57,7 @@
 
 man_MANS =	make.1
 
-DEFS =		-DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
+DEFS =		-DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" -DMULTIARCH_DIRS="$(MULTIARCH_DIRS)" @DEFS@
 
 AM_CPPFLAGS =	$(GLOBINC)
 # Only process if target is MS-Windows

signature.asc
Description: Digital signature