Package: libmpdclient-dev
Version: 2.9-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:mpc src:ncmpc src:ncmpcpp
The packages listed under affects fail to cross build from source,
because they cannot find libmpdclient.pc. During cross compilation,
pkg-config does not search /usr/lib/pkgconfig. It only searches
/usr/share/pkgconfig and /usr/lib/<triplet>/pkgconfig. Thus
libmpdclient.pc should be moved to the latter directory. The attached
patch achieves just that. Please consider applying it.
Helmut
diff -u libmpdclient-2.9/debian/changelog libmpdclient-2.9/debian/changelog
--- libmpdclient-2.9/debian/changelog
+++ libmpdclient-2.9/debian/changelog
@@ -1,3 +1,10 @@
+libmpdclient (2.9-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Pass a multiarch --libdir to ./configure (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 07 Aug 2017 20:58:06 +0200
+
libmpdclient (2.9-1) UNRELEASED; urgency=low
* New upstream release (Closes: #671094).
diff -u libmpdclient-2.9/debian/libmpdclient-dev.install
libmpdclient-2.9/debian/libmpdclient-dev.install
--- libmpdclient-2.9/debian/libmpdclient-dev.install
+++ libmpdclient-2.9/debian/libmpdclient-dev.install
@@ -1,6 +1,6 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
usr/share/vala/vapi/libmpdclient.vapi
diff -u libmpdclient-2.9/debian/libmpdclient2.install
libmpdclient-2.9/debian/libmpdclient2.install
--- libmpdclient-2.9/debian/libmpdclient2.install
+++ libmpdclient-2.9/debian/libmpdclient2.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -u libmpdclient-2.9/debian/rules libmpdclient-2.9/debian/rules
--- libmpdclient-2.9/debian/rules
+++ libmpdclient-2.9/debian/rules
@@ -8,8 +8,7 @@
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
@@ -36,6 +35,7 @@
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)"
build: build-arch build-indep
@@ -70,7 +70,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# we do not want .la files in Debian
- rm -f debian/tmp/usr/lib/libmpdclient.la
+ rm -f debian/tmp/usr/lib/*/libmpdclient.la
# these files do not include any useful content
rm -f debian/tmp/usr/share/doc/libmpdclient/README
