Source: fwbuilder
Version: 5.3.7-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
fwbuilder fails to cross build from source, because it uses the build
architecture qmake. First, it configures twice. Once through autogen.sh
and a second time through dh_auto_configure. The first attempt is for
the build architecture (lacking --host) and thus fails. The solution
here is to only configure once through dh_auto_configure. Then
configure.in searches for qmake with AC_PATH_PROG, but it needs to use
AC_PATH_TOOL as qmake is architecture-dependent. After fixing both,
fwbuilder cross builds successfully. Please consider applying the
attached patch.
Helmut
diff --minimal -Nru fwbuilder-5.3.7/debian/changelog
fwbuilder-5.3.7/debian/changelog
--- fwbuilder-5.3.7/debian/changelog 2018-04-16 09:58:36.000000000 +0200
+++ fwbuilder-5.3.7/debian/changelog 2018-06-07 06:28:54.000000000 +0200
@@ -1,3 +1,10 @@
+fwbuilder (5.3.7-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Configure once. Via dh_auto_configure.
+ + cross.patch: Use the host architecture qmake.
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 07 Jun 2018 06:28:54 +0200
+
fwbuilder (5.3.7-2) unstable; urgency=medium
* d/p/autoconf-fix.patch: Fix a FTBFS with gcc7 (Closes: #895476)
diff --minimal -Nru fwbuilder-5.3.7/debian/patches/cross.patch
fwbuilder-5.3.7/debian/patches/cross.patch
--- fwbuilder-5.3.7/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ fwbuilder-5.3.7/debian/patches/cross.patch 2018-06-07 06:28:54.000000000
+0200
@@ -0,0 +1,17 @@
+--- fwbuilder-5.3.7.orig/configure.in
++++ fwbuilder-5.3.7/configure.in
+@@ -66,11 +66,11 @@
+ AC_MSG_ERROR("Could not find qmake")
+ fi
+ else
+- AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
++ AC_PATH_TOOL(QMAKE, qmake, ,[$EXTENDED_PATH])
+ if test -z "$QMAKE"; then
+- AC_PATH_PROG(QMAKE, qmake-qt5, ,[$EXTENDED_PATH])
++ AC_PATH_TOOL(QMAKE, qmake-qt5, ,[$EXTENDED_PATH])
+ if test -z "$QMAKE"; then
+- AC_PATH_PROG(QMAKE, qmake-qt4, ,[$EXTENDED_PATH])
++ AC_PATH_TOOL(QMAKE, qmake-qt4, ,[$EXTENDED_PATH])
+ if test -z "$QMAKE"; then
+ AC_MSG_ERROR("Could not find qmake")
+ fi
diff --minimal -Nru fwbuilder-5.3.7/debian/patches/series
fwbuilder-5.3.7/debian/patches/series
--- fwbuilder-5.3.7/debian/patches/series 2018-04-16 09:58:36.000000000
+0200
+++ fwbuilder-5.3.7/debian/patches/series 2018-06-07 06:28:54.000000000
+0200
@@ -3,3 +3,4 @@
fwb.diff
qt5-detect.patch
autoconf-fix.patch
+cross.patch
diff --minimal -Nru fwbuilder-5.3.7/debian/rules fwbuilder-5.3.7/debian/rules
--- fwbuilder-5.3.7/debian/rules 2018-04-16 09:58:36.000000000 +0200
+++ fwbuilder-5.3.7/debian/rules 2018-06-07 06:28:49.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
override_dh_auto_configure:
- ./autogen.sh
+ NOCONFIGURE=1 ./autogen.sh
dh_auto_configure
override_dh_auto_install:
