Package: libopusfile-dev
Version: 0.9+20170913-1
Tags: patch
User: [email protected]
Usertags: rebootstrap
Control: affects -1 + src:ioquake3

ioquake3 fails to cross build from source, because it cannot find
opusfile.pc. During cross compilation pkg-config does not search
/usr/lib/pkgconfig. Thus opusfile.pc needs to be moved to a multiarch
directory. The attached patch implements that. Please consider applying
it.

Helmut
diff -u opusfile-0.9+20170913/debian/changelog 
opusfile-0.9+20170913/debian/changelog
--- opusfile-0.9+20170913/debian/changelog
+++ opusfile-0.9+20170913/debian/changelog
@@ -1,3 +1,10 @@
+opusfile (0.9+20170913-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move opusfile.pc to a multiarch location. Closes: #-1
+
+ -- Helmut Grohne <[email protected]>  Sat, 19 May 2018 20:12:10 +0200
+
 opusfile (0.9+20170913-1) unstable; urgency=medium
 
   * Fix an invalid free with tag handling.
diff -u opusfile-0.9+20170913/debian/libopusfile-dev.install 
opusfile-0.9+20170913/debian/libopusfile-dev.install
--- opusfile-0.9+20170913/debian/libopusfile-dev.install
+++ opusfile-0.9+20170913/debian/libopusfile-dev.install
@@ -2,3 +2,3 @@
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
diff -u opusfile-0.9+20170913/debian/libopusfile0.install 
opusfile-0.9+20170913/debian/libopusfile0.install
--- opusfile-0.9+20170913/debian/libopusfile0.install
+++ opusfile-0.9+20170913/debian/libopusfile0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -u opusfile-0.9+20170913/debian/rules opusfile-0.9+20170913/debian/rules
--- opusfile-0.9+20170913/debian/rules
+++ opusfile-0.9+20170913/debian/rules
@@ -11,9 +11,7 @@
 NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
 
 
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
 
 
 # -fstack-protector-all is added by the default autoconf tests.
@@ -70,6 +68,7 @@
                                     --host=$(DEB_HOST_GNU_TYPE)        \
                                     --build=$(DEB_BUILD_GNU_TYPE)      \
                                     --prefix=/usr                      \
+                                    
--libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
                                     $(EXTRA_CONFIG_FLAGS)              \
                                     CPPFLAGS="$(CPPFLAGS)"             \
                                     CFLAGS="$(CFLAGS)"                 \

Reply via email to