Package: tcl8.5 Version: 8.5.10-1 Severity: wishlist Tags: patch Hi,
I'm currently working on cross-building bits of Debian and tcl8.5 fails to build. The reason is simple: tcl8.5 uses the just-built tclsh binary to run scripts to install files into place. I've patched the behaviour here to use mkdir and install instead in the Makefile, and it does the right thing for both native and cross builds as far as I can see. Debdiff attached. Cheers, -- Steve McIntyre [email protected]
diff -u tcl8.5-8.5.10/debian/changelog tcl8.5-8.5.10/debian/changelog --- tcl8.5-8.5.10/debian/changelog +++ tcl8.5-8.5.10/debian/changelog @@ -1,3 +1,11 @@ +tcl8.5 (8.5.10-1.1) unstable; urgency=low + + * Non-maintainer upload + * Don't use tcl itself to install things when building, to allow for + cross-building. + + -- Steve McIntyre <[email protected]> Wed, 29 Jun 2011 01:02:25 +0100 + tcl8.5 (8.5.10-1) unstable; urgency=low * New upstream release (closes: #617628). diff -u tcl8.5-8.5.10/debian/patches/series tcl8.5-8.5.10/debian/patches/series --- tcl8.5-8.5.10/debian/patches/series +++ tcl8.5-8.5.10/debian/patches/series @@ -8,0 +9 @@ +cross-build.diff only in patch2: unchanged: --- tcl8.5-8.5.10.orig/debian/patches/cross-build.diff +++ tcl8.5-8.5.10/debian/patches/cross-build.diff @@ -0,0 +1,24 @@ +--- a/unix/Makefile.in 2011-06-29 00:46:21.604329259 +0100 ++++ b/unix/Makefile.in 2011-06-29 00:47:57.144577776 +0100 +@@ -804,17 +804,13 @@ + + install-tzdata: ${TCL_EXE} + @echo "Installing time zone data" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ +- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ +- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ +- $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata ++ mkdir -p "$(SCRIPT_INSTALL_DIR)"/tzdata ++ install -m644 $(TOP_DIR)/library/tzdata/* "$(SCRIPT_INSTALL_DIR)"/tzdata + + install-msgs: ${TCL_EXE} + @echo "Installing message catalogs" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ +- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ +- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ +- $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs ++ mkdir -p "$(SCRIPT_INSTALL_DIR)"/msgs ++ install -m644 $(TOP_DIR)/library/msgs/* "$(SCRIPT_INSTALL_DIR)"/msgs + + install-doc: doc + @for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
