Bug#969121: cbp2make FTCBFS: builds for the build architecture

[Helmut Grohne]

Hi Graham,

On Fri, Aug 28, 2020 at 08:26:28AM +0200, Graham Inggs wrote:
> I tried your patch, but the resultant binary package is missing
> /usr/bin/cbp2make.
> This package has had a similar problem before, see #956372.

Thank you for your attention to detail. I refactored a little too much
and failed to check the results. I've reverted the refactoring part and
only kept the important bits now.

Helmut
-------------- next part --------------
diff --minimal -Nru cbp2make-147+dfsg/debian/changelog cbp2make-147+dfsg/debian/changelog
--- cbp2make-147+dfsg/debian/changelog	2020-04-16 11:35:31.000000000 +0200
+++ cbp2make-147+dfsg/debian/changelog	2020-08-27 22:23:57.000000000 +0200
@@ -1,3 +1,11 @@
+cbp2make (147+dfsg-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Let dh_auto_build pass cross tools to make and pass LD
+    explicitly. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 27 Aug 2020 22:23:57 +0200
+
 cbp2make (147+dfsg-3) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru cbp2make-147+dfsg/debian/rules cbp2make-147+dfsg/debian/rules
--- cbp2make-147+dfsg/debian/rules	2020-04-16 10:53:27.000000000 +0200
+++ cbp2make-147+dfsg/debian/rules	2020-08-27 22:23:57.000000000 +0200
@@ -10,11 +10,11 @@
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@
+	dh $@ --buildsystem=makefile
 
 override_dh_auto_build-arch:
 	ln -sf cbp2make.cbp.mak.unix Makefile
-	$(MAKE) release
+	dh_auto_build -- release 'LD=$$(CXX)'
 
 #build-indep:
 #	ln -sf cbp2make.cbp.mak.unix Makefile