[pkg-cryptsetup-devel] Bug#811545: makes systemd FTCBFS: libcryptsetup.pc not found

[Helmut Grohne]

Package: libcryptsetup-dev
Version: 2:1.7.0-2
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:systemd

Hi Jonas,

My attempt to cross build systemd failed, because it couldn't find
libcryptsetup.pc. pkg-config does not consider /usr/lib/pkgconfig
during cross builds. Thus libcryptsetup.pc needs to be moved to a
multiarch location to enable cross building of other packages. Please
consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru cryptsetup-1.7.0/debian/changelog cryptsetup-1.7.0/debian/changelog
--- cryptsetup-1.7.0/debian/changelog
+++ cryptsetup-1.7.0/debian/changelog
@@ -1,3 +1,11 @@
+cryptsetup (2:1.7.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * libcryptsetup-dev: move the .pc file to a multiarch location such that
+    cross-pkg-config can find it. (closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 19 Jan 2016 18:00:22 +0100
+
 cryptsetup (2:1.7.0-2) unstable; urgency=medium
 
   [ Guilhem Moulin ]
diff --minimal -Nru cryptsetup-1.7.0/debian/libcryptsetup-dev.dirs cryptsetup-1.7.0/debian/libcryptsetup-dev.dirs
--- cryptsetup-1.7.0/debian/libcryptsetup-dev.dirs
+++ cryptsetup-1.7.0/debian/libcryptsetup-dev.dirs
@@ -1,3 +1,2 @@
 /usr/include
 /usr/lib
-/usr/lib/pkgconfig
diff --minimal -Nru cryptsetup-1.7.0/debian/rules cryptsetup-1.7.0/debian/rules
--- cryptsetup-1.7.0/debian/rules
+++ cryptsetup-1.7.0/debian/rules
@@ -91,6 +91,7 @@
 
 	# Copy library files to library packages
 	mkdir -p $(CURDIR)/debian/libcryptsetup4/lib/$(DEB_HOST_MULTIARCH)/
+	mkdir -p $(CURDIR)/debian/libcryptsetup-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 	#mkdir -p $(CURDIR)/debian/libcryptsetup4/usr/lib/$(DEB_HOST_MULTIARCH)/
 
 	cp -a $(CURDIR)/debian/cryptsetup-bin/lib/libcryptsetup.so.* \
@@ -100,7 +101,7 @@
 	#cp -a $(CURDIR)/debian/cryptsetup-bin/lib/libcryptsetup.a \
 	#	$(CURDIR)/debian/libcryptsetup-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
 	cp -a $(CURDIR)/debian/cryptsetup-bin/lib/pkgconfig/libcryptsetup.pc \
-		$(CURDIR)/debian/libcryptsetup-dev/usr/lib/pkgconfig/
+		$(CURDIR)/debian/libcryptsetup-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
 	cp -a $(CURDIR)/debian/cryptsetup-bin/usr/include/libcryptsetup.h \
 		$(CURDIR)/debian/libcryptsetup-dev/usr/include/
 	#cp -a $(CURDIR)/debian/cryptsetup-bin/lib/libcryptsetup.so \