Package: libgtkspell-dev
Version: 2.0.16-1.1
Tags: patch
Control: affects -1 + src:gummi
User: helm...@debian.org
Usertags: rebootstrap

gummi fails to cross build from source, because it cannot find
gtkspell-2.0.pc. During cross compilation /usr/lib/pkgconfig is not
considered. Only /usr/share/pkgconfig and
/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig are searched. Thus it cannot
find gtkspell-2.0.pc. Please move the .pc file to a multiarch location.
The attached patch achieves just that.

Helmut
diff --minimal -Nru gtkspell-2.0.16/debian/changelog 
gtkspell-2.0.16/debian/changelog
--- gtkspell-2.0.16/debian/changelog    2014-08-30 12:09:50.000000000 +0200
+++ gtkspell-2.0.16/debian/changelog    2017-06-23 22:45:58.000000000 +0200
@@ -1,3 +1,10 @@
+gtkspell (2.0.16-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass a multiarch --libdir to ./configure (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 23 Jun 2017 22:45:58 +0200
+
 gtkspell (2.0.16-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --minimal -Nru gtkspell-2.0.16/debian/libgtkspell-dev.files 
gtkspell-2.0.16/debian/libgtkspell-dev.files
--- gtkspell-2.0.16/debian/libgtkspell-dev.files        2010-01-09 
04:12:54.000000000 +0100
+++ gtkspell-2.0.16/debian/libgtkspell-dev.files        2017-06-23 
22:45:37.000000000 +0200
@@ -1,7 +1,7 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.la
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.la
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gtk-doc/html/gtkspell/*
                                                
diff --minimal -Nru gtkspell-2.0.16/debian/libgtkspell0.files 
gtkspell-2.0.16/debian/libgtkspell0.files
--- gtkspell-2.0.16/debian/libgtkspell0.files   2010-01-09 04:12:54.000000000 
+0100
+++ gtkspell-2.0.16/debian/libgtkspell0.files   2017-06-23 22:45:46.000000000 
+0200
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
 usr/share/locale
diff --minimal -Nru gtkspell-2.0.16/debian/rules gtkspell-2.0.16/debian/rules
--- gtkspell-2.0.16/debian/rules        2014-08-30 12:08:52.000000000 +0200
+++ gtkspell-2.0.16/debian/rules        2017-06-23 22:45:58.000000000 +0200
@@ -9,6 +9,7 @@
 # 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)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 else
@@ -19,7 +20,7 @@
        dh_testdir
        dh_autoreconf
        # Add here commands to configure the package.
-       ./configure $(CROSS) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" 
--disable-gtk-doc --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --disable-gtk-doc
+       ./configure $(CROSS) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" 
--disable-gtk-doc --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info --disable-gtk-doc 
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 
 build: build-stamp
@@ -51,7 +52,7 @@
        # Add here commands to install the package into debian/tmp
        $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
 
-       rm debian/tmp/usr/lib/*.la
+       rm debian/tmp/usr/lib/*/*.la
 
 # Build architecture-independent files here.
 binary-indep: build install

Reply via email to