Package: tix
Version: 8.4.3-6
Tags: patch
Usertags: origin-ubuntu ubuntu-patch vivid
In Ubuntu, we've applied the attached patch to achieve the following:
- debian/rules:
+ Fix build failure with Tcl/Tk multiarch locations.
+ Use dpkg-buildflags.
We thought you might be interested in doing the same.
diff -Nru tix-8.4.3/debian/rules tix-8.4.3/debian/rules
--- tix-8.4.3/debian/rules 2014-11-11 12:20:49.000000000 +0100
+++ tix-8.4.3/debian/rules 2015-02-20 18:44:32.000000000 +0100
@@ -18,14 +18,12 @@
SHELL=/bin/bash
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
+CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
groff_version=`groff -v| grep "groff version"| sed -e 's/GNU groff version //'`
tk_version = 8.6
tix_version = 8.4.3
@@ -45,12 +43,13 @@
rm -rf build-static
mkdir build-static
cd build-static && ../configure \
+ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--disable-shared \
- --with-tclconfig=/usr/lib/tcl$(tk_version) \
+ --with-tclconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tk_version) \
--with-tclinclude=/usr/include/tcl$(tk_version)/tcl-private \
- --with-tkconfig=/usr/lib/tk$(tk_version) \
+ --with-tkconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tk_version) \
--with-tkinclude=/usr/include/tcl$(tk_version)/tk-private
$(MAKE) -C build-static
@@ -63,12 +62,13 @@
rm -rf build-shared
mkdir build-shared
cd build-shared && ../configure \
+ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--enable-shared \
- --with-tclconfig=/usr/lib/tcl$(tk_version) \
+ --with-tclconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tk_version) \
--with-tclinclude=/usr/include/tcl$(tk_version)/tcl-private \
- --with-tkconfig=/usr/lib/tk$(tk_version) \
+ --with-tkconfig=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tk_version) \
--with-tkinclude=/usr/include/tcl$(tk_version)/tk-private
$(MAKE) -C build-shared \
