[Pkg-tcltk-devel] Bug#870853: captures unqualified compiler in tclConfig.sh variable TCL_CC

[Helmut Grohne]

Package: tcl8.6-dev
Version: 8.6.6+dfsg-1
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:tcl-signal

The build of tcl8.6 captures the ./configure detected CC into a variable
TCL_CC stored in tclConfig.sh in tcl8.6-dev. Other packages end up
sourcing that file in ./configure and use TCL_CC for building (e.g.
tcl-signal). Since tcl8.6-dev uses "gcc" (i.e. the build architecture
compiler), such packages fail to cross build. tclConfig.sh (being an
architecture dependent file) should use an architecture-qualified
compiler, i.e. one with the host architecture prefix. The attached patch
ensures that tcl8.6's ./configure uses such a qualified CC. Please
consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru tcl8.6-8.6.6+dfsg/debian/changelog tcl8.6-8.6.6+dfsg/debian/changelog
--- tcl8.6-8.6.6+dfsg/debian/changelog	2016-07-28 05:15:50.000000000 +0200
+++ tcl8.6-8.6.6+dfsg/debian/changelog	2017-08-05 21:30:21.000000000 +0200
@@ -1,3 +1,10 @@
+tcl8.6 (8.6.6+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Arch-qualify TCL_CC. (closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 05 Aug 2017 21:30:21 +0200
+
 tcl8.6 (8.6.6+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --minimal -Nru tcl8.6-8.6.6+dfsg/debian/rules tcl8.6-8.6.6+dfsg/debian/rules
--- tcl8.6-8.6.6+dfsg/debian/rules	2016-07-28 05:05:40.000000000 +0200
+++ tcl8.6-8.6.6+dfsg/debian/rules	2017-08-05 21:30:16.000000000 +0200
@@ -10,6 +10,10 @@
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 export LDFLAGS
 
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 # See bug #446335 for -fno-unit-at-a-time
 ifeq ($(DEB_HOST_ARCH), hppa)
@@ -33,6 +37,7 @@
 	TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk \
 			  /usr/lib/tcltk/$(DEB_HOST_MULTIARCH) /usr/lib/tcltk /usr/share/tcltk \
 			  /usr/lib/tcltk/tcl$(v) /usr/lib" \
+	CC="$(CC)" \
 	CFLAGS="$(CFLAGS)" \
 	CPPFLAGS="$(CPPFLAGS)" \
 	TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$${TCL_LIB_FILE}" \