Bug#618377: gnome-pkg-tools: Please run clean-la.mk on both /usr/lib, and multiarch dirs

[Steve Langasek]

Package: gnome-pkg-tools
Version: 0.16.3
Severity: important
Tags: patch
User: vorlon at debian.org
Usertags: multiarch

Hi all,

gnome-pkg-tools includes a very helpful clean-la.mk rule that cleans up
dependency_libs in .la files.  However, it only acts on .la files it finds
directly under /usr/lib - with multiarch, this will be the exception rather
than the rule.

The attached patch updates gnome-pkg-tools to optionally fix up .la files
under /usr/lib/$(DEB_HOST_MULTIARCH), *if* $(DEB_HOST_MULTIARCH) is set. 
Since this is a no-op without $(DEB_HOST_MULTIARCH), it should be safe to
apply in unstable whenever convenient without needing dpkg support to land
first.  And the $(DEB_HOST_MULTIARCH) variable name has been agreed with the
dpkg maintainers (already queued for inclusion in dpkg 1.16.0), and should
be exported by cdbs soon (bug #617841).

This change has already been applied in Ubuntu natty, with the following
changelog:

  * 1/rules/clean-la.mk: if $DEB_HOST_MULTIARCH is set, look in this
    directory for .la files to clean also.

Cheers,
-- 
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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file '1/rules/clean-la.mk'
--- 1/rules/clean-la.mk	2006-09-07 14:23:07 +0000
+++ 1/rules/clean-la.mk	2011-03-14 19:53:36 +0000
@@ -4,3 +4,9 @@
 	for file in $(wildcard debian/$(cdbs_curpkg)/usr/lib/*.la); do \
 		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 		done
+ifneq (,$(DEB_HOST_MULTIARCH))
+	for file in $(wildcard debian/$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/*.la); do \
+		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+	done
+endif
+