Source: xournal
Version: 1:0.4.8-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

xournal fails to cross build from source, because it configures for the
build architecture. It actually configures twice, once from autogen.sh
and once through dh_auto_configure. The latter is a proper cross
compilation configure, but the former fails for the build architecture.
Simply removing it makes the build faster and fixes cross compilation.
It doesn't pass --enable-maintainer-mode though, but that can be simply
appended to dh_auto_configure if necessary. Can you apply the patch with
or without that modification?

Helmut
diff --minimal -Nru xournal-0.4.8/debian/changelog 
xournal-0.4.8/debian/changelog
--- xournal-0.4.8/debian/changelog      2014-10-27 02:41:35.000000000 +0100
+++ xournal-0.4.8/debian/changelog      2017-09-18 14:35:36.000000000 +0200
@@ -1,3 +1,10 @@
+xournal (1:0.4.8-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do not configure before dh_auto_configure (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 18 Sep 2017 14:35:36 +0200
+
 xournal (1:0.4.8-1) unstable; urgency=medium
 
   * New upstream release (Closes: #756974, #700586, #659586)
diff --minimal -Nru xournal-0.4.8/debian/rules xournal-0.4.8/debian/rules
--- xournal-0.4.8/debian/rules  2014-10-27 02:27:39.000000000 +0100
+++ xournal-0.4.8/debian/rules  2017-09-18 14:35:33.000000000 +0200
@@ -30,7 +30,7 @@
        cp -a src/Makefile.in src/Makefile.in.alt
        cp -a src/ttsubset/Makefile.in src/ttsubset/Makefile.in.alt
        # Configure the package.
-       ./autogen.sh --prefix=/usr
+       NOCONFIGURE=1 ./autogen.sh
        dh_auto_configure -- $(shell dpkg-buildflags --export=configure)
 
        touch configure-stamp

Reply via email to