[Debian-astro-maintainers] Bug#929757: wsclean misbuilds: build/host confusion

[Helmut Grohne]

Source: wsclean
Version: 2.6-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

wsclean successfully cross builds a broken package. It confuses build
and host architecture. Refer to man dpkg-architecture for an explanation
of these terms. The attached patch makes it build sanely. Please
consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru wsclean-2.6/debian/changelog wsclean-2.6/debian/changelog
--- wsclean-2.6/debian/changelog	2018-08-06 12:07:06.000000000 +0200
+++ wsclean-2.6/debian/changelog	2019-05-30 09:52:20.000000000 +0200
@@ -1,3 +1,10 @@
+wsclean (2.6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Fix build/host confusion. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 30 May 2019 09:52:20 +0200
+
 wsclean (2.6-1) unstable; urgency=low
 
   * Push Standards-Versionto 4.2.0. No changes required
diff --minimal -Nru wsclean-2.6/debian/patches/Build-and-use-shared-lib-for-libwsclean.patch wsclean-2.6/debian/patches/Build-and-use-shared-lib-for-libwsclean.patch
--- wsclean-2.6/debian/patches/Build-and-use-shared-lib-for-libwsclean.patch	2018-06-13 13:04:47.000000000 +0200
+++ wsclean-2.6/debian/patches/Build-and-use-shared-lib-for-libwsclean.patch	2019-05-30 09:51:50.000000000 +0200
@@ -34,8 +34,8 @@
  
  install(TARGETS wsclean DESTINATION bin)
 -install(TARGETS wsclean-lib DESTINATION lib)
-+install(TARGETS wsclean-lib DESTINATION lib/${DEB_BUILD_MULTIARCH})
-+install(TARGETS wsclean-shared DESTINATION lib/${DEB_BUILD_MULTIARCH})
++install(TARGETS wsclean-lib DESTINATION lib/${DEB_HOST_MULTIARCH})
++install(TARGETS wsclean-shared DESTINATION lib/${DEB_HOST_MULTIARCH})
  install(FILES interface/wscleaninterface.h DESTINATION include)
  
  # add target to generate API documentation with Doxygen
diff --minimal -Nru wsclean-2.6/debian/rules wsclean-2.6/debian/rules
--- wsclean-2.6/debian/rules	2018-06-13 13:04:47.000000000 +0200
+++ wsclean-2.6/debian/rules	2019-05-30 09:52:18.000000000 +0200
@@ -3,7 +3,8 @@
 
 #export DH_VERBOSE=1
 
-CMAKE_FLAGS += -DDEB_BUILD_MULTIARCH=`dpkg-architecture -qDEB_BUILD_MULTIARCH` -DPORTABLE=yes
+include /usr/share/dpkg/architecture.mk
+CMAKE_FLAGS += -DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH) -DPORTABLE=yes
 
 %:
 	dh $@