Source: dwdiff
Version: 2.1.2-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
dwdiff fails to cross build from source, becaue it uses the build
architecture pkg-config where it needs the host architecture one. The
attached patch makes dwdiff cross buildable. Please consider applying
it.
Helmut
diff --minimal -Nru dwdiff-2.1.2/debian/changelog dwdiff-2.1.2/debian/changelog
--- dwdiff-2.1.2/debian/changelog 2018-12-10 20:21:45.000000000 +0100
+++ dwdiff-2.1.2/debian/changelog 2019-02-15 15:49:38.000000000 +0100
@@ -1,3 +1,10 @@
+dwdiff (2.1.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use a triplet-prefixed pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 15 Feb 2019 15:49:38 +0100
+
dwdiff (2.1.2-1) unstable; urgency=medium
* New upstream version
diff --minimal -Nru dwdiff-2.1.2/debian/patches/cross.patch
dwdiff-2.1.2/debian/patches/cross.patch
--- dwdiff-2.1.2/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ dwdiff-2.1.2/debian/patches/cross.patch 2019-02-15 15:49:36.000000000
+0100
@@ -0,0 +1,36 @@
+--- dwdiff-2.1.2.orig/config.pkg
++++ dwdiff-2.1.2/config.pkg
+@@ -125,11 +125,12 @@
+ fi
+
+ if [ "yes" = "${with_unicode}" ] ; then
++ : "${PKG_CONFIG:=pkg-config}"
+ {
+ check_message "Checking for ICU pkg-config... "
+ {
+- echo "Running pkg-config --cflags --libs
icu-uc" >> config.log
+- if pkg-config --cflags --libs icu-uc 2>&1 >
/dev/null ; then
++ echo "Running $PKG_CONFIG --cflags --libs
icu-uc" >> config.log
++ if $PKG_CONFIG --cflags --libs icu-uc 2>&1 >
/dev/null ; then
+ check_message_result "yes"
+ true
+ else
+@@ -156,15 +157,15 @@
+ }
+ EOF
+ clean .config.o
+- test_link "functions in libicu"
ICUFLAGS="\`pkg-config --cflags icu-uc\`" ICULIBS="\`pkg-config --libs icu-uc\`"
++ test_link "functions in libicu"
ICUFLAGS="\`$PKG_CONFIG --cflags icu-uc\`" ICULIBS="\`$PKG_CONFIG --libs
icu-uc\`"
+ }
+ } || {
+ check_message_result "!! Could not compile with Unicode
support. Try configuring with --without-unicode."
+ exit 1
+ }
+
+- ICUFLAGS="-DUSE_UNICODE \`pkg-config --cflags icu-uc\`"
+- ICULIBS="\`pkg-config --libs icu-uc\`"
++ ICUFLAGS="-DUSE_UNICODE \`$PKG_CONFIG --cflags icu-uc\`"
++ ICULIBS="\`$PKG_CONFIG --libs icu-uc\`"
+ if checkfunction "nl_langinfo" "nl_langinfo(CODESET);"
"<langinfo.h>" ; then
+ ICUFLAGS="${ICUFLAGS} -DUSE_NL_LANGINFO"
+ fi
diff --minimal -Nru dwdiff-2.1.2/debian/patches/series
dwdiff-2.1.2/debian/patches/series
--- dwdiff-2.1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ dwdiff-2.1.2/debian/patches/series 2019-02-15 15:47:27.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru dwdiff-2.1.2/debian/rules dwdiff-2.1.2/debian/rules
--- dwdiff-2.1.2/debian/rules 2018-06-04 14:43:13.000000000 +0200
+++ dwdiff-2.1.2/debian/rules 2019-02-15 15:47:46.000000000 +0100
@@ -24,6 +24,7 @@
-include /usr/share/dpkg/buildtools.mk
export CC
+export PKG_CONFIG ?= pkg-config
export CFLAGS = \
$(shell dpkg-buildflags --get CFLAGS) \
$(shell dpkg-buildflags --get CPPFLAGS)
