Merge lp:~peter-pearse/ubuntu/natty/tcl8.5/prop001 into lp:ubuntu/natty/tcl8.5

[Peter Pearse]

debian patch added to allow cross building of the unix variant.

unix/configure patched
- pass down both CC & CC_FOR_BUILD
- modify SHLIB_LD & STLIB_LD to pass ${CC_IN_USE} rather than ${CC} to
  allow two make passes with differing toolchains

configure.in not patched since the debian build does not autoconfigure.

unix/Makefile.in patched
- detect cross building
- if cross building add an extra pass to build a host tclch & preserve it
  for the second pass

[Steve Langasek (vorlon)]

The changelog says "add debian patch" - does that mean this is a patch sourced from Debian? If so, please document the authorship.

[Steve Langasek (vorlon)]

Very nice overall. A few comments:

+ifeq ($(BUILD_HOST_PASS),)
+ ifneq ($(CC),$(CC_FOR_BUILD))
+ @echo "Copy back the binary from the build host pass"
+ cp tclsh_host tclsh
+ endif
+else

Surely the second check is redundant, since BUILD_HOST_PASS is only set when $(CC) and $(CC_FOR_BUILD) are different. Simplify by dropping the inner check?

+ifeq ($(BUILD_HOST_PASS),)
+ # Cross compiler
+ CC_TO_USE = $(CC)
+else
+ # Build host compiler
+ CC_TO_USE = $(CC_FOR_BUILD)
+endif

With the previous change, because the build-host build is done in a submake we can instead reduce this to:

ifneq ($(BUILD_HOST_PASS),)
     # Build host compiler
     CC = $(CC_FOR_BUILD)
endif

That will significantly shorten the patch.

Also, changes to unix/configure.in seem to be missing from the patch; only the changes to unix/configure are applied.

review: Needs Fixing

[Steve Langasek (vorlon)]

Lastly: debian/changelog shows a version of '8.5.8-2build2'. the 'build' suffix is reserved for binary-only package rebuilds that don't change the source; this needs to be '8.5.8-2ubuntu1'.

[lp:~peter-pearse/ubuntu/natty/tcl8.5/prop001]

14. By Peter Pearse on 2011-04-19

Incorporate Steve Langasek's suggestions.

Unmerged revisions

14. By Peter Pearse on 2011-04-19

Incorporate Steve Langasek's suggestions.

13. By Peter Pearse on 2011-02-01

Add debian patch to allow cross building of unix variant

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-03 20:01:52 +0000
+++ debian/changelog	2011-04-19 14:06:14 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 tcl8.5 (8.5.9-2) unstable; urgency=low
 
   * Moved /usr/share/tcltk/tcl8.5/tclConfig.sh back to the /usr/lib/tcl8.5
@@ -15,6 +16,19 @@
   * Added ${misc:Depends} to debian/control.
 
  -- Sergei Golovan <[e-mail]>  Fri, 05 Nov 2010 13:33:59 +0300
+=======
+tcl8.5 (8.5.8-2ubuntu1) natty; urgency=low
+
+  * Patch to allow cross building of unix variant
+
+ -- Peter Pearse <[e-mail]>  Tue, 01 Feb 2011 11:05:28 +0000
+
+tcl8.5 (8.5.8-2build1) maverick; urgency=low
+
+  * Rebuild to set TCL_CC properly on i386.
+
+ -- Matthias Klose <[e-mail]>  Wed, 30 Jun 2010 13:53:09 +0200
+>>>>>>> MERGE-SOURCE
 
 tcl8.5 (8.5.8-2) unstable; urgency=low
 

=== added file 'debian/patches/cross.diff'
--- debian/patches/cross.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/cross.diff	2011-04-19 14:06:14 +0000
@@ -0,0 +1,121 @@
+Index: tcl8.5/unix/configure
+===================================================================
+--- tcl8.5.orig/unix/configure	2011-04-19 13:50:23.000000000 +0000
++++ tcl8.5/unix/configure	2011-04-19 13:50:23.000000000 +0000
+@@ -308,7 +308,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAN_FLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP TCL_THREADS RANLIB ac_ct_RANLIB AR LIBOBJS TCL_LIBS DL_LIBS DL_OBJS PLAT_OBJS PLAT_SRCS LDAIX_SRC CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING LDFLAGS_DEBUG LDFLAGS_OPTIMIZE CC_SEARCH_FLAGS LD_SEARCH_FLAGS STLIB_LD SHLIB_LD TCL_SHLIB_LD_EXTRAS TK_SHLIB_LD_EXTRAS SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX MAKE_LIB MAKE_STUB_LIB INSTALL_LIB INSTALL_STUB_LIB CFLAGS_DEFAULT LDFLAGS_DEFAULT DTRACE TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_YEAR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_STUB_LIB_PATH TCL_INCLUDE_SPEC TCL_BUILD_STUB_LIB_SPEC TCL_BUILD_STUB_LIB_PATH TCL_SRC_DIR CFG_TCL_SHARED_LIB_SUFFIX CFG_TCL_UNSHARED_LIB_SUFFIX CFG_TCL_EXPORT_FILE_SUFFIX TCL_SHARED_BUILD LD_LIBRARY_PATH_VAR TCL_BUILD_LIB_SPEC TCL_NEEDS_EXP_FILE TCL_BUILD_EXP_FILE TCL_EXP_FILE TCL_LIB_VERSIONS_OK TCL_SHARED_LIB_SUFFIX TCL_UNSHARED_LIB_SUFFIX TCL_HAS_LONGLONG INSTALL_TZDATA DTRACE_SRC DTRACE_HDR DTRACE_OBJ MAKEFILE_SHELL BUILD_DLTEST TCL_PACKAGE_PATH TCL_MODULE_PATH TCL_LIBRARY PRIVATE_INCLUDE_DIR HTML_DIR EXTRA_CC_SWITCHES EXTRA_APP_CC_SWITCHES EXTRA_INSTALL EXTRA_INSTALL_BINARIES EXTRA_BUILD_HTML EXTRA_TCLSH_LIBS DLTEST_LD DLTEST_SUFFIX'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAN_FLAGS CC CC_FOR_BUILD CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP TCL_THREADS RANLIB ac_ct_RANLIB AR LIBOBJS TCL_LIBS DL_LIBS DL_OBJS PLAT_OBJS PLAT_SRCS LDAIX_SRC CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING LDFLAGS_DEBUG LDFLAGS_OPTIMIZE CC_SEARCH_FLAGS LD_SEARCH_FLAGS STLIB_LD SHLIB_LD TCL_SHLIB_LD_EXTRAS TK_SHLIB_LD_EXTRAS SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX MAKE_LIB MAKE_STUB_LIB INSTALL_LIB INSTALL_STUB_LIB CFLAGS_DEFAULT LDFLAGS_DEFAULT DTRACE TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_YEAR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_STUB_LIB_PATH TCL_INCLUDE_SPEC TCL_BUILD_STUB_LIB_SPEC TCL_BUILD_STUB_LIB_PATH TCL_SRC_DIR CFG_TCL_SHARED_LIB_SUFFIX CFG_TCL_UNSHARED_LIB_SUFFIX CFG_TCL_EXPORT_FILE_SUFFIX TCL_SHARED_BUILD LD_LIBRARY_PATH_VAR TCL_BUILD_LIB_SPEC TCL_NEEDS_EXP_FILE TCL_BUILD_EXP_FILE TCL_EXP_FILE TCL_LIB_VERSIONS_OK TCL_SHARED_LIB_SUFFIX TCL_UNSHARED_LIB_SUFFIX TCL_HAS_LONGLONG INSTALL_TZDATA DTRACE_SRC DTRACE_HDR DTRACE_OBJ MAKEFILE_SHELL BUILD_DLTEST TCL_PACKAGE_PATH TCL_MODULE_PATH TCL_LIBRARY PRIVATE_INCLUDE_DIR HTML_DIR EXTRA_CC_SWITCHES EXTRA_APP_CC_SWITCHES EXTRA_INSTALL EXTRA_INSTALL_BINARIES EXTRA_BUILD_HTML EXTRA_TCLSH_LIBS DLTEST_LD DLTEST_SUFFIX'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -10021,6 +10021,25 @@
+    { (exit 1); exit 1; }; } ;;
+ esac
+ 
++#--------------------------------------------------------------------
++# When cross building one may need to build some tools as both
++# host & build binaries so we supply both build & host compilers
++#--------------------------------------------------------------------
++echo "$as_me:$LINENO: setting CC_FOR_BUILD" >&5
++echo $ECHO_N "setting CC_FOR_BUILD... $ECHO_C" >&6
++
++CC_FOR_BUILD=${CC}
++if test "$cross_compiling" != no; then
++  cc_converted=`echo ${CC} | sed 's/-/\//g'`
++  cc_suffix=`basename $cc_converted`
++  if test "x$build_alias" = x; then
++    CC_FOR_BUILD=$cc_suffix
++  else
++    CC_FOR_BUILD=$build_alias\-$cc_suffix
++  fi
++fi
++echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
++echo "${CC_FOR_BUILD}" >&6
+ 
+ #--------------------------------------------------------------------
+ #	Supply substitutes for missing POSIX library procedures, or
+@@ -19158,8 +19177,6 @@
+ DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+ rm -f confdef2opt.sed
+ 
+-
+-
+ CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
+ 
+ : ${CONFIG_STATUS=./config.status}
+@@ -19691,6 +19708,7 @@
+ s,@LIBS@,$LIBS,;t t
+ s,@MAN_FLAGS@,$MAN_FLAGS,;t t
+ s,@CC@,$CC,;t t
++s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+ s,@LDFLAGS@,$LDFLAGS,;t t
+ s,@CPPFLAGS@,$CPPFLAGS,;t t
+Index: tcl8.5/unix/Makefile.in
+===================================================================
+--- tcl8.5.orig/unix/Makefile.in	2011-04-19 13:50:23.000000000 +0000
++++ tcl8.5/unix/Makefile.in	2011-04-19 13:56:44.000000000 +0000
+@@ -236,8 +236,14 @@
+ TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
+ 
+ CC			= @CC@
++# Compiler for building build host tools used during the build:
++CC_FOR_BUILD            = @CC_FOR_BUILD@
+ #CC			= purify -best-effort @CC@ -DPURIFY
+ 
++ifeq ($(BUILD_HOST_PASS),1)
++      CC = $(CC_FOR_BUILD)
++endif
++
+ # Flags to be passed to installManPage to control how the manpages should be
+ # installed (symlinks, compression, package name suffix).
+ MAN_FLAGS               = @MAN_FLAGS@
+@@ -540,7 +546,21 @@
+ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
+ 	$(STUB_SRCS) @PLAT_SRCS@
+ 
++
++ifeq (${CC},${CC_FOR_BUILD})
+ all: binaries libraries doc
++else
++
++# Add a target to build the host binaries (tclsh) used during the build
++all: host_binaries binaries libraries doc
++
++host_binaries:
++	@echo "Build the host binaries used during the build"
++	$(MAKE) binaries BUILD_HOST_PASS=1
++	@echo "Now clean for cross building pass"
++	$(MAKE) clean BUILD_HOST_PASS=1
++
++endif
+ 
+ binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+ 
+@@ -572,6 +592,14 @@
+ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ 	${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
+ 		${CC_SEARCH_FLAGS} -o tclsh
++	cp tclsh tclsh_to_install
++ifeq ($(BUILD_HOST_PASS),)
++	@echo "Copy back the binary from the build host pass"
++	cp tclsh_host tclsh
++else
++	@echo "Preserve the host binary for use in the second pass"
++	cp tclsh tclsh_host
++endif
+ 
+ # Resetting the LIB_RUNTIME_DIR below is required so that the generated
+ # tcltest executable gets the build directory burned into its ld search path.
+@@ -740,7 +768,7 @@
+ 			"$(LIB_INSTALL_DIR)"/$(TCL_EXP_FILE); \
+ 	    fi
+ 	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
+-	@$(INSTALL_PROGRAM) tclsh "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
++	@$(INSTALL_PROGRAM) tclsh_to_install "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)
+ 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
+ 	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
+ 	@if test "$(STUB_LIB_FILE)" != "" ; then \

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-05 13:33:59 +0000
+++ debian/patches/series	2011-04-19 14:06:14 +0000
@@ -6,3 +6,8 @@
 rpath.diff
 non-linux.diff
 manpages.diff
+<<<<<<< TREE
+=======
+mips.diff
+cross.diff
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/rules'
--- debian/rules	2011-03-03 20:01:52 +0000
+++ debian/rules	2011-04-19 14:06:14 +0000
@@ -138,6 +138,7 @@
 		rm $$f ; \
 	     fi ; \
 	  done
+	find unix -name tclsh_\* -exec rm -fr {} \;
 	touch install-stamp
 
 # Build architecture-independent files here.