aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/tcltk/tk/confsearch.diff')
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk/confsearch.diff15
1 files changed, 8 insertions, 7 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
index 8cc07bcfac8..81d47357526 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
@@ -7,6 +7,7 @@ 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.
+Upstream-Status: Pending
---
unix/configure | 1 +
unix/tcl.m4 | 2 ++
@@ -16,31 +17,31 @@ Index: a/unix/configure
===================================================================
--- a/unix/configure.orig
+++ b/unix/configure
-@@ -1432,6 +1432,7 @@ echo "$as_me: error: ${with_tclconfig} d
+@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
+ `ls -d /usr/lib/tcl8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
- `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
Index: a/unix/tcl.m4
===================================================================
--- a/unix/tcl.m4.orig
+++ b/unix/tcl.m4
-@@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
+@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
+ `ls -d /usr/lib/tcl8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
- `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
-@@ -227,6 +228,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
+@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
-+ `ls -d /usr/share/tcltk/tk8.6 2>/dev/null` \
++ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
+ `ls -d /usr/lib/tk8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
- `ls -d /usr/local/lib/tk8.6 2>/dev/null` \