Bug#812667: discover FTCBFS: uses build architecture compiler
Source: discover
Version: 2.1.2-7
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Hi,
discover fails to cross build from source, because it uses the build
architecture compilers. This causes configure to fail some of its
requirements, which are only available to the host architecture. The
correct solution of course is to use the host architecture compiler.
This can be achieved by passing --build and --host to the configure
script. I am attaching a patch implementing this for your convenience.
Helmut
diff -u discover-2.1.2/debian/rules discover-2.1.2/debian/rules
--- discover-2.1.2/debian/rules
+++ discover-2.1.2/debian/rules
@@ -23,6 +23,8 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
+include /usr/share/dpkg/architecture.mk
+
VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
ARCH=$(shell dpkg --print-architecture)
@@ -64,6 +66,10 @@
--with-default-url=file:///lib/discover/list.xml \
--disable-curl
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+RUN_CONFIGURE += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
configure: configure-deb
configure-deb: configure-deb-stamp
diff -u discover-2.1.2/debian/changelog discover-2.1.2/debian/changelog
--- discover-2.1.2/debian/changelog
+++ discover-2.1.2/debian/changelog
@@ -1,3 +1,10 @@
+discover (2.1.2-7.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Pass --host to configure (Closes: #-1).
+
+ -- Helmut Grohne <helmut@subdivi.de> Mon, 25 Jan 2016 20:52:03 +0100
+
discover (2.1.2-7) unstable; urgency=medium
* Ack NMUs 2.1.2-5.1 and 2.1.2-5.2 and merge them into subversion.
Reply to: