Control: reopen -1
On Sat, Oct 14, 2017 at 06:36:03PM +0000, Debian Bug Tracking System wrote:
> * Fix conditionally set crossbuild compiler.
> Closes: Bug#841761. Thanks to Helmut Grohne.
Unfortunately, your second attempt didn't work either. It yields e.g.
| fakeroot debian/rules clean
| /usr/share/cdbs/1/class/langcore.mk:49: *** empty variable name. Stop.
| dpkg-buildpackage: error: fakeroot debian/rules clean gave error exit status 2
while building freerdp. The attached patch fixes that. Maybe it is time
for adding a testcase?
Helmut
diff --minimal -Nru cdbs-0.4.155/1/class/langcore.mk.in
cdbs-0.4.155+nmu1/1/class/langcore.mk.in
--- cdbs-0.4.155/1/class/langcore.mk.in 2017-10-14 19:21:24.000000000 +0200
+++ cdbs-0.4.155+nmu1/1/class/langcore.mk.in 2017-10-16 17:07:06.000000000
+0200
@@ -44,10 +44,10 @@
-include debian/_cdbs_buildflags.mk
$(shell rm -f debian/_cdbs_buildflags.mk)
-$(and $(cdbs_crossbuild),$(filter default,$(origin CC)),\
- CC := $(DEB_HOST_GNU_TYPE)-gcc)
-$(and $(cdbs_crossbuild),$(filter default,$(origin CXX)),\
- CXX := $(DEB_HOST_GNU_TYPE)-g++)
+$(eval $(and $(cdbs_crossbuild),$(filter default,$(origin CC)),\
+ CC := $(DEB_HOST_GNU_TYPE)-gcc))
+$(eval $(and $(cdbs_crossbuild),$(filter default,$(origin CXX)),\
+ CXX := $(DEB_HOST_GNU_TYPE)-g++))
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
diff --minimal -Nru cdbs-0.4.155/debian/changelog
cdbs-0.4.155+nmu1/debian/changelog
--- cdbs-0.4.155/debian/changelog 2017-10-14 19:26:51.000000000 +0200
+++ cdbs-0.4.155+nmu1/debian/changelog 2017-10-16 17:08:38.000000000 +0200
@@ -1,3 +1,10 @@
+cdbs (0.4.155+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix CC assignment in langcore.mk. (Closes: #841761)
+
+ -- Helmut Grohne <[email protected]> Mon, 16 Oct 2017 17:08:38 +0200
+
cdbs (0.4.155) unstable; urgency=medium
* Fix conditionally set crossbuild compiler.
