Source: xpdf
Version: 3.04-1
Tags: patch
User: [email protected]
Usertags: rebootstrap

xpdf fails to cross build from source, because it generally uses build
architecture tools (C++ compiler, pkg-config). Switching to triplet-
prefixed tools makes the build work both cross and natively. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru xpdf-3.04/debian/changelog xpdf-3.04/debian/changelog
--- xpdf-3.04/debian/changelog  2016-02-07 19:00:51.000000000 +0100
+++ xpdf-3.04/debian/changelog  2016-11-05 17:37:22.000000000 +0100
@@ -1,3 +1,10 @@
+xpdf (3.04-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use triplet-prefixed tools (closes: #-1).
+
+ -- Helmut Grohne <[email protected]>  Sat, 05 Nov 2016 17:37:05 +0100
+
 xpdf (3.04-1) unstable; urgency=medium
 
   * New upstream release.
diff --minimal -Nru xpdf-3.04/debian/rules xpdf-3.04/debian/rules
--- xpdf-3.04/debian/rules      2016-02-07 18:59:57.000000000 +0100
+++ xpdf-3.04/debian/rules      2016-11-05 17:37:03.000000000 +0100
@@ -4,8 +4,13 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-includes=$(strip $(shell pkg-config --cflags poppler))
-LIBS+=-lXm $(shell pkg-config --libs poppler --libs xt --libs x11) -pthread
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CXX),default)
+CXX = $(DEB_HOST_GNU_TYPE)-g++
+endif
+
+includes=$(strip $(shell $(DEB_HOST_GNU_TYPE)-pkg-config --cflags poppler))
+LIBS+=-lXm $(shell $(DEB_HOST_GNU_TYPE)-pkg-config --libs poppler --libs xt 
--libs x11) -pthread
 CPPFLAGS+=$(includes) $(includes)/goo $(includes)/splash
 CPPFLAGS+=-Wno-write-strings -Wno-format-extra-args
 CPPFLAGS+=-DHAVE_DIRENT_H -DSYSTEM_XPDFRC=\"/etc/xpdf/xpdfrc\"

Reply via email to