tcl: updated to version 8.5.13

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 29 insertions, 45 deletions

diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index 9c295a66dd..71956f30b7 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -15,11 +15,11 @@ Fixes tcl target recipe build on old distros which have glibc older than 2.14
 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
 2012/04/26
 
-Index: unix/Makefile.in
-===================================================================
+diff --git unix.orig/Makefile.in unix/Makefile.in
+index c8ce872..06a6406 100644
 --- unix.orig/Makefile.in
 +++ unix/Makefile.in
-@@ -592,12 +592,12 @@ tcltest-real:
+@@ -594,12 +594,12 @@ tcltest-real:
  #	% make test TESTFLAGS="-verbose bps -file fileName.test"
  
  test: tcltest@EXEEXT@
@@ -34,7 +34,7 @@ Index: unix/Makefile.in
  	@echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
  	@echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run
  	$(GDB) ./tcltest@EXEEXT@ --command=gdb.run
-@@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@
+@@ -607,27 +607,27 @@ gdb-test: tcltest@EXEEXT@
  
  # Useful target to launch a built tcltest with the proper path,...
  runtest: tcltest@EXEEXT@
@@ -66,7 +66,7 @@ Index: unix/Makefile.in
  	@echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
  	$(GDB) ${TCL_EXE} --command=gdb.run
  	rm gdb.run
-@@ -633,12 +633,12 @@ gdb: ${TCL_EXE}
+@@ -635,12 +635,12 @@ gdb: ${TCL_EXE}
  VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
  
  valgrind: ${TCL_EXE} tcltest@EXEEXT@
@@ -81,24 +81,16 @@ Index: unix/Makefile.in
  	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
  	valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT)
  
-@@ -802,14 +802,14 @@ install-libraries: libraries $(INSTALL_T
+@@ -795,7 +795,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
  
  install-tzdata: ${TCL_EXE}
- 	@echo "Installing time zone data"
+ 	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
 -	@@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; \
  	${TCL_EXE} $(TOOL_DIR)/installData.tcl \
  	    $(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@; \
-+	@@LD_LIBRARY_PATH_VAR@="$${@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
-@@ -1733,7 +1733,7 @@ html-tk: ${TCL_EXE}
+@@ -1729,7 +1729,7 @@ html-tk: ${TCL_EXE}
  	@EXTRA_BUILD_HTML@
  
  BUILD_HTML = \
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index 9c2d379611..c5f6d8e70b 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
@@ -1,10 +1,10 @@
 Upstream-Status: Pending
 
-Index: unix/Makefile.in
-===================================================================
+diff --git unix.orig/Makefile.in unix/Makefile.in
+index 87deb20..c8ce872 100644
 --- unix.orig/Makefile.in
 +++ unix/Makefile.in
-@@ -619,13 +619,13 @@ ro-test: tcltest@EXEEXT@
+@@ -623,13 +623,13 @@ ro-test: tcltest@EXEEXT@
  shell: ${TCL_EXE}
  	@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
  	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -20,7 +20,7 @@ Index: unix/Makefile.in
  	rm gdb.run
  
  VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
-@@ -638,7 +638,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
+@@ -642,7 +642,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
  valgrindshell: ${TCL_EXE}
  	@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
  	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -29,24 +29,16 @@ Index: unix/Makefile.in
  
  # The following target outputs the name of the top-level source directory for
  # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL
-@@ -802,14 +802,14 @@ install-tzdata: ${TCL_EXE}
- 	@echo "Installing time zone data"
+@@ -797,7 +797,7 @@ install-tzdata: ${TCL_EXE}
+ 	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
  	@@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 \
 +	${TCL_EXE} $(TOOL_DIR)/installData.tcl \
  	    $(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 \
-+	${TCL_EXE} $(TOOL_DIR)/installData.tcl \
- 	    $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
- 
- install-doc: doc
-@@ -1730,7 +1730,7 @@ html-tk: ${TCL_EXE}
+ install-msgs:
+@@ -1731,7 +1731,7 @@ html-tk: ${TCL_EXE}
  BUILD_HTML = \
  	@@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/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index 93ef1868c5..9947954dbe 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,7 +1,7 @@
 Upstream-Status: Pending
 
-Index: unix/configure
-===================================================================
+diff --git unix.orig/configure unix/configure
+index 163b210..e531122 100755
 --- unix.orig/configure
 +++ unix/configure
 @@ -6757,6 +6757,7 @@ fi
@@ -12,11 +12,11 @@ Index: unix/configure
  
  	    DL_OBJS="tclLoadDl.o"
  	    LD_LIBRARY_PATH_VAR="LIBPATH"
-Index: unix/tcl.m4
-===================================================================
+diff --git unix.orig/tcl.m4 unix/tcl.m4
+index 3974753..46870fa 100644
 --- unix.orig/tcl.m4
 +++ unix/tcl.m4
-@@ -1399,12 +1399,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1420,12 +1420,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -33,7 +33,7 @@ Index: unix/tcl.m4
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
  	    AS_IF([test $do64bit = yes], [
-@@ -1430,6 +1433,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1451,6 +1454,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_SUFFIX=".so"
@@ -41,12 +41,12 @@ Index: unix/tcl.m4
  
  	    SHLIB_LD='${CC} -shared'
  	    DL_OBJS=""
-@@ -2081,7 +2085,7 @@ dnl # preprocessing tests use only CPPFL
+@@ -2103,7 +2107,7 @@ dnl # preprocessing tests use only CPPFLAGS.
  
      AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 -        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
 +        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
-     ], [
-         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+         AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
+             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
+             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.13.bb
index b8f1e9af65..27a9ef66c1 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.13.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
     file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
     "
 
-PR = "r6"
+PR = "r0"
 
 BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
                 file://tcl-add-soname.patch"
@@ -20,8 +20,8 @@ SRC_URI = "${BASE_SRC_URI} \
 	   file://fix_non_native_build_issue.patch \
 	   file://fix_issue_with_old_distro_glibc.patch "
 
-SRC_URI[md5sum] = "b01a9691c83990b3db0ce62d1012ca67"
-SRC_URI[sha256sum] = "8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a"
+SRC_URI[md5sum] = "fa3a9bf9b2d6ed2431f1baa46f4058b8"
+SRC_URI[sha256sum] = "9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a"
 
 SRC_URI_class-native = "${BASE_SRC_URI}"