[pkg-x2go-devel] Bug#875867: nx-libs-lite FTCBFS: configures for the build architecture

[Helmut Grohne]

Source: nx-libs-lite
Version: 3.5.0.32-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

nx-libs-lite fails to cross build from source, because it doesn't pass
--host=... to ./configure. It also passes wrong --libdir to ./configure.
The attached patch fixes both issues and makes nx-libs-lite cross build
successfully. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru nx-libs-lite-3.5.0.32/debian/changelog nx-libs-lite-3.5.0.32/debian/changelog
--- nx-libs-lite-3.5.0.32/debian/changelog	2015-07-16 08:18:50.000000000 +0200
+++ nx-libs-lite-3.5.0.32/debian/changelog	2017-09-15 13:44:39.000000000 +0200
@@ -1,3 +1,12 @@
+nx-libs-lite (3.5.0.32-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Fix build/host confusion in debian/rules.
+    + Pass --host to ./configure.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 15 Sep 2017 13:44:39 +0200
+
 nx-libs-lite (3.5.0.32-1) unstable; urgency=medium
 
   * New upstream release.
diff --minimal -Nru nx-libs-lite-3.5.0.32/debian/rules nx-libs-lite-3.5.0.32/debian/rules
--- nx-libs-lite-3.5.0.32/debian/rules	2015-07-16 08:15:23.000000000 +0200
+++ nx-libs-lite-3.5.0.32/debian/rules	2017-09-15 13:44:39.000000000 +0200
@@ -5,12 +5,14 @@
 export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
+include /usr/share/dpkg/architecture.mk
+
 export PREFIX     = /usr
-export LIBDIR     = /usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-export INCLUDEDIR = /usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+export LIBDIR     = /usr/lib/$(DEB_HOST_MULTIARCH)
+export INCLUDEDIR = /usr/include/$(DEB_HOST_MULTIARCH)
 
 %:
-	CONFIGURE="./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR)" dh $@ --parallel
+	CONFIGURE="./configure --prefix=$(PREFIX) --libdir=$(LIBDIR) --includedir=$(INCLUDEDIR) --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)" dh $@ --parallel
 
 override_dh_install:
 	rm debian/tmp/usr/lib/*/libXcomp.a