From: Daniel Kriesten <[email protected]> if ptxdists tcl and hosttcl are of the same version using pwd in LD_LIBRARY_PATH when calling hosts tclsh
Signed-off-by: Daniel Kriesten <[email protected]> --- patches/tcl8.5.7/series | 2 +- patches/tcl8.5.7/use_hosts_tclsh.diff | 47 ++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/patches/tcl8.5.7/series b/patches/tcl8.5.7/series index 2087077..9ecc6f0 100644 --- a/patches/tcl8.5.7/series +++ b/patches/tcl8.5.7/series @@ -1,2 +1,2 @@ -use_hosts_tclsh.diff -p0 +use_hosts_tclsh.diff fix_link_pathes.diff -p0 diff --git a/patches/tcl8.5.7/use_hosts_tclsh.diff b/patches/tcl8.5.7/use_hosts_tclsh.diff index 9b51845..b938c17 100644 --- a/patches/tcl8.5.7/use_hosts_tclsh.diff +++ b/patches/tcl8.5.7/use_hosts_tclsh.diff @@ -1,28 +1,39 @@ -Subject: [patch] don't use cross compiled tools -From: Juergen Beisert <[email protected]> +From 01e8eb2c9eea746458f4f92f0c77205ca0b80d4a Mon Sep 17 00:00:00 2001 +From: Daniel Kriesten <[email protected]> +Date: Tue, 22 Feb 2011 13:50:46 +0100 +Subject: [PATCH] Remove pwd from library path + This avoids using the cross compiled libraries when calling host's tclsh -Force the install stage to use the host's TCL shell instead -of its own. This fails badly while cross compiling. - -Disadvantage: You need a proper TCL interpreter on the host - -FIXME: looks like we need a proper host-tcl - -Signed-off-by: Juergen Beisert <[email protected]> +Signed-off-by: Daniel Kriesten <[email protected]> --- - unix/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + unix/Makefile.in | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) -Index: unix/Makefile.in -=================================================================== ---- unix/Makefile.in.orig -+++ unix/Makefile.in -@@ -824,7 +824,7 @@ install-msgs: tclsh +diff --git a/unix/Makefile.in b/unix/Makefile.in +index 17561a5..992acec 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -815,16 +815,16 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs + + install-tzdata: tclsh + @echo "Installing time zone data" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ +- ./tclsh $(TOOL_DIR)/installData.tcl \ ++ tclsh $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata + + install-msgs: tclsh @echo "Installing message catalogs" - @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ - ./tclsh $(TOOL_DIR)/installData.tcl \ + tclsh $(TOOL_DIR)/installData.tcl \ $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs install-doc: doc +-- +1.7.3.4 + -- 1.7.3.4 -- ptxdist mailing list [email protected]
