tk: upgrade 8.6.0 -> 8.6.4

update content of non-linux.diff

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
new file mode 100644
index 0000000000..c51e475426
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
@@ -0,0 +1,32 @@
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
+and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
+installation.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -1431,6 +1431,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tclConfig.sh" ; then
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -93,6 +93,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tclConfig.sh" ; then
+@@ -223,6 +224,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tkConfig.sh" ; then