mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-02-15 14:40:24 +00:00
b955bbbba4
1.Upgrade tk from 8.6.6 to 8.6.8. 2.Modify confsearch.diff, since the data has been changed. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
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,7 +1431,8 @@
|
|
`ls -d /usr/contrib/lib 2>/dev/null` \
|
|
`ls -d /usr/local/lib 2>/dev/null` \
|
|
`ls -d /usr/pkg/lib 2>/dev/null` \
|
|
+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
|
|
`ls -d /usr/lib 2>/dev/null` \
|
|
`ls -d /usr/lib64 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,7 +93,8 @@
|
|
`ls -d /usr/contrib/lib 2>/dev/null` \
|
|
`ls -d /usr/local/lib 2>/dev/null` \
|
|
`ls -d /usr/pkg/lib 2>/dev/null` \
|
|
+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
|
|
`ls -d /usr/lib 2>/dev/null` \
|
|
`ls -d /usr/lib64 2>/dev/null` \
|
|
; do
|
|
if test -f "$i/tclConfig.sh" ; then
|
|
@@ -223,7 +224,8 @@
|
|
`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` \
|
|
`ls -d /usr/lib64 2>/dev/null` \
|
|
; do
|
|
if test -f "$i/tkConfig.sh" ; then
|