Source: odt2txt
Version: 0.5-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

odt2txt fails to cross build from source, because debian/rules hard
codes the build architecture pkg-config and thus fails getting cflags
for libzip, which is only requested for the host architecture by
debian/control. The fix to this issue is to use a triplet-prefixed
pkg-config. After doing so, odt2txt still fails to cross build from
source, because cdbs fails to pass cross compilers to make. Please close
this bug anyway when fixing the pkg-config part.

Helmut
diff --minimal -Nru odt2txt-0.5/debian/changelog odt2txt-0.5/debian/changelog
--- odt2txt-0.5/debian/changelog        2015-05-31 02:53:01.000000000 +0200
+++ odt2txt-0.5/debian/changelog        2017-10-19 06:46:55.000000000 +0200
@@ -1,3 +1,10 @@
+odt2txt (0.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Partially fix FTCBFS: Use a triplet-prefixed pkg-config (Closes: #-1).
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 19 Oct 2017 06:46:55 +0200
+
 odt2txt (0.5-1) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru odt2txt-0.5/debian/rules odt2txt-0.5/debian/rules
--- odt2txt-0.5/debian/rules    2015-05-31 02:41:56.000000000 +0200
+++ odt2txt-0.5/debian/rules    2017-10-19 06:46:52.000000000 +0200
@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/odt2txt/usr
 DEB_MAKE_ENVVARS := HAVE_LIBZIP="true"
-CFLAGS += -DHAVE_LIBZIP `pkg-config libzip --cflags`
+CFLAGS += -DHAVE_LIBZIP `$(DEB_HOST_GNU_TYPE)-pkg-config libzip --cflags`
 
 binary-install/odt2txt::
        mv $(CURDIR)/debian/odt2txt/usr/bin/odt2txt 
$(CURDIR)/debian/odt2txt/usr/bin/odt2txt.odt2txt

Reply via email to