[Debian-astro-maintainers] Bug#941037: sopt cross misbuilds: build/host confusion

[Helmut Grohne]

Source: sopt
Version: 3.0.1-2
Tags: patch

When cross building sopt, it successfully cross builds a broken binary
package, because it confuses build and host. Please refer to man
dpkg-architecture for a definition of these terms. Please consider
applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru sopt-3.0.1/debian/changelog sopt-3.0.1/debian/changelog
--- sopt-3.0.1/debian/changelog	2019-09-20 11:30:50.000000000 +0200
+++ sopt-3.0.1/debian/changelog	2019-09-23 22:20:31.000000000 +0200
@@ -1,3 +1,10 @@
+sopt (3.0.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build/host confusion. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 23 Sep 2019 22:20:31 +0200
+
 sopt (3.0.1-2) unstable; urgency=low
 
   * Switch to unstable to start transition
diff --minimal -Nru sopt-3.0.1/debian/patches/Multiarch-patch.patch sopt-3.0.1/debian/patches/Multiarch-patch.patch
--- sopt-3.0.1/debian/patches/Multiarch-patch.patch	2019-09-20 11:30:23.000000000 +0200
+++ sopt-3.0.1/debian/patches/Multiarch-patch.patch	2019-09-23 22:20:05.000000000 +0200
@@ -16,7 +16,7 @@
    DESTINATION share/cmake/sopt
 -  LIBRARY DESTINATION lib
 -  ARCHIVE DESTINATION lib
-+  LIBRARY DESTINATION lib/${DEB_BUILD_MULTIARCH}
-+  ARCHIVE DESTINATION lib/${DEB_BUILD_MULTIARCH}
++  LIBRARY DESTINATION lib/${DEB_HOST_MULTIARCH}
++  ARCHIVE DESTINATION lib/${DEB_HOST_MULTIARCH}
    INCLUDES DESTINATION include
    )
diff --minimal -Nru sopt-3.0.1/debian/rules sopt-3.0.1/debian/rules
--- sopt-3.0.1/debian/rules	2019-02-02 10:43:36.000000000 +0100
+++ sopt-3.0.1/debian/rules	2019-09-23 22:20:29.000000000 +0200
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CMAKE_FLAGS += -DDEB_BUILD_MULTIARCH=`dpkg-architecture -qDEB_BUILD_MULTIARCH`
+CMAKE_FLAGS += -DDEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
 
 %:
 	dh $@ --buildsystem=cmake