Source: tcplay
Version: 1.1-4
User: helm...@debian.org
Usertags: rebootstrap

tcplay fails to cross build from source, because the packaging confuses
build architecture and host architcture in the build directory chosen by
debhelper. The attached patch fixes that by not having to know it.
Please consider applying it.

Helmut
diff --minimal -Nru tcplay-1.1/debian/changelog tcplay-1.1/debian/changelog
--- tcplay-1.1/debian/changelog 2017-06-04 14:44:11.000000000 +0200
+++ tcplay-1.1/debian/changelog 2018-04-09 14:37:52.000000000 +0200
@@ -1,3 +1,10 @@
+tcplay (1.1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Fix build/host confusion. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 09 Apr 2018 14:37:52 +0200
+
 tcplay (1.1-4) unstable; urgency=medium
 
   * Use the real LGPL Crypto library (closes: #864138).
diff --minimal -Nru tcplay-1.1/debian/rules tcplay-1.1/debian/rules
--- tcplay-1.1/debian/rules     2013-07-15 21:19:08.000000000 +0200
+++ tcplay-1.1/debian/rules     2018-04-09 14:37:49.000000000 +0200
@@ -20,16 +20,9 @@
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        DEBUG = DEBUG=yes
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
-
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 override_dh_auto_build:
-       cd $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)/ && \
-               $(MAKE) SYSTEM=linux PBKDF_BACKEND=gcrypt $(DEBUG)
+       dh_auto_build -- SYSTEM=linux PBKDF_BACKEND=gcrypt $(DEBUG)
 
 # test needs the library, which can't be built ATM
 override_dh_auto_test:

Reply via email to