diff options
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb (renamed from meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb) | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index c51e475426..4dbd9a4f16 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | |||
| @@ -4,29 +4,32 @@ installation. | |||
| 4 | 4 | ||
| 5 | --- tk8.5-8.5.8.orig/unix/configure | 5 | --- tk8.5-8.5.8.orig/unix/configure |
| 6 | +++ tk8.5-8.5.8/unix/configure | 6 | +++ tk8.5-8.5.8/unix/configure |
| 7 | @@ -1431,6 +1431,7 @@ | 7 | @@ -1431,7 +1431,8 @@ |
| 8 | `ls -d ${prefix}/lib 2>/dev/null` \ | ||
| 9 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 10 | `ls -d /usr/contrib/lib 2>/dev/null` \ | 8 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
| 9 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 10 | `ls -d /usr/pkg/lib 2>/dev/null` \ | ||
| 11 | + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ | 11 | + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ |
| 12 | `ls -d /usr/lib 2>/dev/null` \ | 12 | `ls -d /usr/lib 2>/dev/null` \ |
| 13 | `ls -d /usr/lib64 2>/dev/null` \ | ||
| 13 | ; do | 14 | ; do |
| 14 | if test -f "$i/tclConfig.sh" ; then | 15 | if test -f "$i/tclConfig.sh" ; then |
| 15 | --- tk8.5-8.5.8.orig/unix/tcl.m4 | 16 | --- tk8.5-8.5.8.orig/unix/tcl.m4 |
| 16 | +++ tk8.5-8.5.8/unix/tcl.m4 | 17 | +++ tk8.5-8.5.8/unix/tcl.m4 |
| 17 | @@ -93,6 +93,7 @@ | 18 | @@ -93,7 +93,8 @@ |
| 18 | `ls -d ${prefix}/lib 2>/dev/null` \ | ||
| 19 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 20 | `ls -d /usr/contrib/lib 2>/dev/null` \ | 19 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
| 20 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 21 | `ls -d /usr/pkg/lib 2>/dev/null` \ | ||
| 21 | + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ | 22 | + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ |
| 22 | `ls -d /usr/lib 2>/dev/null` \ | 23 | `ls -d /usr/lib 2>/dev/null` \ |
| 24 | `ls -d /usr/lib64 2>/dev/null` \ | ||
| 23 | ; do | 25 | ; do |
| 24 | if test -f "$i/tclConfig.sh" ; then | 26 | if test -f "$i/tclConfig.sh" ; then |
| 25 | @@ -223,6 +224,7 @@ | 27 | @@ -223,7 +224,8 @@ |
| 26 | `ls -d ${prefix}/lib 2>/dev/null` \ | 28 | `ls -d ${prefix}/lib 2>/dev/null` \ |
| 27 | `ls -d /usr/local/lib 2>/dev/null` \ | 29 | `ls -d /usr/local/lib 2>/dev/null` \ |
| 28 | `ls -d /usr/contrib/lib 2>/dev/null` \ | 30 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
| 29 | + `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ | 31 | + `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ |
| 30 | `ls -d /usr/lib 2>/dev/null` \ | 32 | `ls -d /usr/lib 2>/dev/null` \ |
| 33 | `ls -d /usr/lib64 2>/dev/null` \ | ||
| 31 | ; do | 34 | ; do |
| 32 | if test -f "$i/tkConfig.sh" ; then | 35 | if test -f "$i/tkConfig.sh" ; then |
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb index d3bf397b48..13dc4d7513 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | |||
| @@ -26,8 +26,8 @@ SRC_URI = "\ | |||
| 26 | file://fix-xft.diff \ | 26 | file://fix-xft.diff \ |
| 27 | file://configure.use.fontconfig.with.xft.patch \ | 27 | file://configure.use.fontconfig.with.xft.patch \ |
| 28 | " | 28 | " |
| 29 | SRC_URI[md5sum] = "dd7dbb3a6523c42d05f6ab6e86096e99" | 29 | SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba" |
| 30 | SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d" | 30 | SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" |
| 31 | 31 | ||
| 32 | S = "${WORKDIR}/${BPN}${PV}/unix" | 32 | S = "${WORKDIR}/${BPN}${PV}/unix" |
| 33 | 33 | ||
