Merge lp:~peter-pearse/ubuntu/natty/tk8.4/prop001 into lp:ubuntu/natty/tk8.4

[Peter Pearse]

Note that the crossed tclConfig.sh has to be crossed e.g. -L /usr/lib deleted.

[Steve Langasek (vorlon)]

+ CONFIGURE_EXTRA_ARGS += --with-tcl=/usr/$(DEB_HOST_GNU_TYPE)/usr/lib/tcl$(v)

This is the path when extracting tcl with dpkg -x, not the path that would be given by a "properly" dpkg-crossed package. The path should be:

--with-tcl=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl$(v)

I don't want us hard-coding paths in the packages that are artifacts of a current (and hopefully temporary) dpkg bug.

+ CONFIGURE_ENV_SET = TK_LIBRARY="/usr/share/tcltk/tk$(v)"

This same value is being set in both the cross and native cases. is it meant to be different, or should this be moved back to the build-stamp target, reducing duplication?

review: Needs Fixing

Unmerged revisions

8. By Peter Pearse on 2011-02-16

Patch debian/rules for cross building

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-05 12:12:26 +0000
+++ debian/changelog	2011-02-16 13:45:49 +0000
@@ -1,3 +1,9 @@
+tk8.4 (8.4.19-4ubuntu1) natty; urgency=low
+
+  * Patch debian/rules for cross building
+
+ -- Peter Pearse <[e-mail]>  Wed, 16 Feb 2011 13:41:21 +0000
+
 tk8.4 (8.4.19-4) unstable; urgency=low
 
   * Removed Anselm Lingnau from uploaders list (closes: #540858).

=== modified file 'debian/rules'
--- debian/rules	2009-09-05 12:12:26 +0000
+++ debian/rules	2011-02-16 13:45:49 +0000
@@ -11,6 +11,19 @@
 
 v = 8.4
 
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+        CONFIGURE_ENV_SET  = TK_LIBRARY="/usr/share/tcltk/tk$(v)"
+        CONFIGURE_ENV_SET += CC=$(DEB_HOST_GNU_TYPE)-gcc
+
+        # Only pass --host where host & build differ
+        # See /usr/share/doc/autotools-dev/README.Debian.gz
+        CONFIGURE_EXTRA_ARGS  = --host=$(DEB_HOST_GNU_TYPE)
+        CONFIGURE_EXTRA_ARGS += --with-tcl=/usr/$(DEB_HOST_GNU_TYPE)/usr/lib/tcl$(v)
+else
+        CONFIGURE_ENV_SET  = TK_LIBRARY="/usr/share/tcltk/tk$(v)"
+        CONFIGURE_EXTRA_ARGS += --with-tcl=/usr/lib/tcl$(v) 
+endif
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS=-g -O0
 else
@@ -33,8 +46,8 @@
 build-stamp: patch-stamp
 	dh_testdir
 	cd unix && \
-	  TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
-	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
+	  $(CONFIGURE_ENV_SET) TCL_LIB_SPEC=online \
+	  ./configure 	\
 		      --build=$(DEB_BUILD_GNU_TYPE) \
 		      --prefix=/usr \
 		      --includedir=/usr/include/tcl$(v) \
@@ -42,7 +55,9 @@
 		      --enable-shared \
 		      --enable-threads \
 		      --enable-man-symlinks \
-		      --enable-man-compression=gzip && \
+		      --enable-man-compression=gzip \
+		      $(CONFIGURE_EXTRA_ARGS) \
+	  && \
 	  $(MAKE) CFLAGS="$(CFLAGS)"
 # Build the static library.
 	cd unix && \