diff options
| -rw-r--r-- | patches/tcl8.5.7/generic/fix_link_pathes.diff (renamed from patches/tcl8.5.6/generic/fix_link_pathes.diff) | 8 | ||||
| -rw-r--r-- | patches/tcl8.5.7/generic/series (renamed from patches/tcl8.5.6/generic/series) | 0 | ||||
| -rw-r--r-- | patches/tcl8.5.7/generic/use_hosts_tclsh.diff (renamed from patches/tcl8.5.6/generic/use_hosts_tclsh.diff) | 2 | ||||
| -rw-r--r-- | rules/tcl.make | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/patches/tcl8.5.6/generic/fix_link_pathes.diff b/patches/tcl8.5.7/generic/fix_link_pathes.diff index f9da41e82..5f021a81f 100644 --- a/patches/tcl8.5.6/generic/fix_link_pathes.diff +++ b/patches/tcl8.5.7/generic/fix_link_pathes.diff @@ -15,7 +15,7 @@ Index: unix/configure =================================================================== --- unix/configure.orig +++ unix/configure -@@ -18830,7 +18830,7 @@ else +@@ -18911,7 +18911,7 @@ else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`" fi TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}" @@ -24,9 +24,9 @@ Index: unix/configure else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -18863,9 +18863,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then +@@ -18944,9 +18944,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl" + TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" elif test "$prefix/lib" != "$libdir"; then - TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" + TCL_PACKAGE_PATH="$SYSROOT${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" @@ -36,7 +36,7 @@ Index: unix/configure fi #-------------------------------------------------------------------- -@@ -18887,12 +18887,12 @@ else +@@ -18968,12 +18968,12 @@ else fi TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}" diff --git a/patches/tcl8.5.6/generic/series b/patches/tcl8.5.7/generic/series index 2087077ca..2087077ca 100644 --- a/patches/tcl8.5.6/generic/series +++ b/patches/tcl8.5.7/generic/series diff --git a/patches/tcl8.5.6/generic/use_hosts_tclsh.diff b/patches/tcl8.5.7/generic/use_hosts_tclsh.diff index 96126027f..8c55ece1a 100644 --- a/patches/tcl8.5.6/generic/use_hosts_tclsh.diff +++ b/patches/tcl8.5.7/generic/use_hosts_tclsh.diff @@ -10,7 +10,7 @@ Index: unix/Makefile.in =================================================================== --- unix/Makefile.in.orig +++ unix/Makefile.in -@@ -820,7 +820,7 @@ install-msgs: tclsh +@@ -824,7 +824,7 @@ install-msgs: tclsh @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; \ diff --git a/rules/tcl.make b/rules/tcl.make index 4d37338bd..124cc1e2a 100644 --- a/rules/tcl.make +++ b/rules/tcl.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_TCL) += tcl # TCL_MAJOR := 8 TCL_MINOR := 5 -TCL_PL := 6 +TCL_PL := 7 TCL_VERSION := $(TCL_MAJOR).$(TCL_MINOR).$(TCL_PL) TCL := tcl$(TCL_VERSION) TCL_SUFFIX := -src.tar.gz @@ -134,7 +134,7 @@ $(STATEDIR)/tcl.targetinstall: ifdef PTXCONF_TCL_TESTING @$(call install_copy, tcl, 0, 0, 0755, /usr/lib/tcl$(TCL_MAJOR)) @$(call install_copy, tcl, 0, 0, 0644, -, \ - /usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.0.tm) + /usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.1.tm) @$(call install_copy, tcl, 0, 0, 0644, -, \ /usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.4.2.tm) |