tcl: update 8.6.11 -> 8.6.12

(From OE-Core rev: 511005999739be5dc87955135880a248110dc1e2)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 30 insertions, 20 deletions

diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index c4283c4f34..3123d289a1 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,25 +1,21 @@
+From d6155ec08b355d64f1a7db407254d159037bb72a Mon Sep 17 00:00:00 2001
+From: Richard Purdie <rpurdie@linux.intel.com>
+Date: Wed, 9 Dec 2009 23:59:44 +0000
+Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
+
 Upstream-Status: Pending
 
-Index: unix/tcl.m4
-===================================================================
---- a/unix.orig/tcl.m4  2013-09-19 13:17:13.000000000 -0700
-+++ b/unix/tcl.m4       2013-11-11 00:17:24.263485123 -0800
-@@ -1415,6 +1415,9 @@
-            # get rid of the warnings.
-            #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
-+           # following line added by CW for Debian GNU/Linux
-+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
-+
-            SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
-            DL_OBJS="tclLoadDl.o"
-            DL_LIBS="-ldl"
-Index: unix/Makefile.in
-===================================================================
---- a/unix.orig/Makefile.in     2013-09-19 13:17:13.000000000 -0700
-+++ b/unix/Makefile.in  2013-11-11 00:20:32.423489861 -0800
-@@ -796,7 +796,10 @@
-            done;
+---
+ unix/Makefile.in | 5 ++++-
+ unix/tcl.m4      | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index 398afd0..804532e 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -893,7 +893,10 @@ install-binaries: binaries
+        done
         @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
         @@INSTALL_LIB@
 -       @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
@@ -30,3 +26,17 @@ Index: unix/Makefile.in
         @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
         @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
         @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index f3d08ec..797c93f 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -1382,6 +1382,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+            # get rid of the warnings.
+            #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
++           # following line added by CW for Debian GNU/Linux
++           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
++
+            SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
+            DL_OBJS="tclLoadDl.o"
+            DL_LIBS="-ldl"