Package: tk8.4 Version: 8.4.19-5 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu raring ubuntu-patch cross
In Ubuntu, the attached patch was applied to achieve the following: * Respect DEB_HOST_GNU_TYPE when selecting CC for cross-compiling. * Preseed undetectable strtod values to autoconf for cross-builds. This preseeds some values that autoconf can't sort out on its own when cross-compiling, thus fixing cross builds. Additionally, unlike tk8.5, tk8.4 has a broken configure script that doesn't respect --host and --build, so this also forces CC on cross-builds. ... Adam -- System Information: Debian Release: wheezy/sid APT prefers raring-updates APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 'raring') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.7.0-4-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru tk8.4-8.4.19/debian/changelog tk8.4-8.4.19/debian/changelog diff -Nru tk8.4-8.4.19/debian/rules tk8.4-8.4.19/debian/rules --- tk8.4-8.4.19/debian/rules 2012-05-29 09:38:09.000000000 -0600 +++ tk8.4-8.4.19/debian/rules 2012-12-08 00:55:26.000000000 -0700 @@ -3,6 +3,14 @@ v = 8.4 DIR = $(shell pwd)/debian/tmp +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + export CC = $(DEB_HOST_GNU_TYPE)-gcc + CROSSCONF = ac_cv_func_strtod=yes tcl_cv_strtod_buggy=1 +endif + DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk @@ -15,7 +23,7 @@ dh $@ override_dh_auto_configure: - TK_LIBRARY="/usr/share/tcltk/tk$(v)" \ + TK_LIBRARY="/usr/share/tcltk/tk$(v)" $(CROSSCONF) \ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ dh_auto_configure -Dunix -- \ --includedir=/usr/include/tcl$(v) \
