diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-13 18:33:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-16 08:07:01 +0100 |
commit | bdd51994e1b5ad9e587a20ab6bdc08113e0016b9 (patch) | |
tree | c4f616b82b747467609affaad3fbc1aeac444016 /meta | |
parent | a4c06a9986e6a9f45c9521aaa099958a51bdc091 (diff) | |
download | poky-bdd51994e1b5ad9e587a20ab6bdc08113e0016b9.tar.gz |
tcl: update 8.6.13 -> 8.6.14
Drop recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
(very obsolete)
(From OE-Core rev: 59fabff31d4ed80b379cadb510dccb0d89976f0a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch | 39 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/interp.patch | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.14.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.6.13.bb) | 5 |
7 files changed, 38 insertions, 72 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 96d0ab2ad4..bfc718cfd3 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 27e5595c065ce3af687818555a882ab5e1dfbc2b Mon Sep 17 00:00:00 2001 | 1 | From 3130dca60636dc12d0d12df75b002fd123349e21 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Tue, 22 Nov 2022 18:48:27 +0800 | 3 | Date: Tue, 22 Nov 2022 18:48:27 +0800 |
4 | Subject: [PATCH] tcl: update the header location | 4 | Subject: [PATCH] tcl: update the header location |
@@ -19,7 +19,6 @@ to detect tcl doesn't find the header. | |||
19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
21 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 21 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
22 | |||
23 | --- | 22 | --- |
24 | unix/Makefile.in | 2 +- | 23 | unix/Makefile.in | 2 +- |
25 | unix/configure.in | 4 ++-- | 24 | unix/configure.in | 4 ++-- |
@@ -27,7 +26,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
27 | 3 files changed, 4 insertions(+), 4 deletions(-) | 26 | 3 files changed, 4 insertions(+), 4 deletions(-) |
28 | 27 | ||
29 | diff --git a/unix/Makefile.in b/unix/Makefile.in | 28 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
30 | index 0b8179f..4824b28 100644 | 29 | index a3b7d69..969ddb8 100644 |
31 | --- a/unix/Makefile.in | 30 | --- a/unix/Makefile.in |
32 | +++ b/unix/Makefile.in | 31 | +++ b/unix/Makefile.in |
33 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) | 32 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) |
@@ -40,10 +39,10 @@ index 0b8179f..4824b28 100644 | |||
40 | # Path to the private tcl header dir: | 39 | # Path to the private tcl header dir: |
41 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ | 40 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ |
42 | diff --git a/unix/configure.in b/unix/configure.in | 41 | diff --git a/unix/configure.in b/unix/configure.in |
43 | index 0354a0b..2d0c00f 100644 | 42 | index 4974fb6..a72934f 100644 |
44 | --- a/unix/configure.in | 43 | --- a/unix/configure.in |
45 | +++ b/unix/configure.in | 44 | +++ b/unix/configure.in |
46 | @@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" | 45 | @@ -776,7 +776,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
47 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 46 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
48 | 47 | ||
49 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | 48 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
@@ -52,7 +51,7 @@ index 0354a0b..2d0c00f 100644 | |||
52 | HTML_DIR='$(DISTDIR)/html' | 51 | HTML_DIR='$(DISTDIR)/html' |
53 | 52 | ||
54 | # Note: in the following variable, it's important to use the absolute | 53 | # Note: in the following variable, it's important to use the absolute |
55 | @@ -895,7 +895,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" | 54 | @@ -897,7 +897,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" |
56 | TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" | 55 | TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" |
57 | 56 | ||
58 | # Install time header dir can be set via --includedir | 57 | # Install time header dir can be set via --includedir |
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch deleted file mode 100644 index 2c31cec8e3..0000000000 --- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Fixes tcl target recipe build on old distros which have glibc older than 2.14 | ||
4 | |||
5 | | + echo 'NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install' | ||
6 | | NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install | ||
7 | | + make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install | ||
8 | | Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib | ||
9 | | Installing message catalogs | ||
10 | | Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man | ||
11 | | tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so) | ||
12 | | Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin | ||
13 | | make: *** [install-msgs] Error 1 | ||
14 | |||
15 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
16 | 2012/04/26 | ||
17 | |||
18 | Index: unix/Makefile.in | ||
19 | =================================================================== | ||
20 | --- a/unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800 | ||
21 | +++ b/unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800 | ||
22 | @@ -686,7 +686,7 @@ | ||
23 | # tcltest executable gets the build directory burned into its ld search path. | ||
24 | # This keeps tcltest from picking up an already installed version of the Tcl | ||
25 | # library. | ||
26 | -SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ | ||
27 | +SHELL_ENV = @LD_LIBRARY_PATH_VAR@=${@LD_LIBRARY_PATH_VAR@} \ | ||
28 | TCLLIBPATH="@abs_builddir@/pkgs" \ | ||
29 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" | ||
30 | |||
31 | @@ -712,7 +712,7 @@ | ||
32 | $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | ||
33 | |||
34 | gdb-test: ${TCLTEST_EXE} | ||
35 | - @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
36 | + @echo "set env @LD_LIBRARY_PATH_VAR@=$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
37 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | ||
38 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | ||
39 | $(GDB) ${TCLTEST_EXE} --command=gdb.run | ||
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index 6dbef7077f..09c49daa2c 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | |||
@@ -1,19 +1,18 @@ | |||
1 | From 8a6c77cdd265fe7ce35929f58f1ade0c6bc4025b Mon Sep 17 00:00:00 2001 | 1 | From 371aa300369e9ea3234cba22d5c0babc7d40dfdf Mon Sep 17 00:00:00 2001 |
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | 2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> |
3 | Date: Fri, 13 Aug 2010 12:24:00 -0700 | 3 | Date: Fri, 13 Aug 2010 12:24:00 -0700 |
4 | Subject: [PATCH] tcl: fix a build issue | 4 | Subject: [PATCH] tcl: fix a build issue |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [upstream does not support installed tests] | 6 | Upstream-Status: Inappropriate [upstream does not support installed tests] |
7 | |||
8 | --- | 7 | --- |
9 | unix/Makefile.in | 20 ++++++++++---------- | 8 | unix/Makefile.in | 20 ++++++++++---------- |
10 | 1 file changed, 10 insertions(+), 10 deletions(-) | 9 | 1 file changed, 10 insertions(+), 10 deletions(-) |
11 | 10 | ||
12 | diff --git a/unix/Makefile.in b/unix/Makefile.in | 11 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
13 | index b110fe9..d7b35a8 100644 | 12 | index 9dd053d..a3b7d69 100644 |
14 | --- a/unix/Makefile.in | 13 | --- a/unix/Makefile.in |
15 | +++ b/unix/Makefile.in | 14 | +++ b/unix/Makefile.in |
16 | @@ -814,23 +814,23 @@ tcltest-real: | 15 | @@ -815,7 +815,7 @@ tcltest-real: |
17 | test: test-tcl test-packages | 16 | test: test-tcl test-packages |
18 | 17 | ||
19 | test-tcl: ${TCLTEST_EXE} | 18 | test-tcl: ${TCLTEST_EXE} |
@@ -21,9 +20,11 @@ index b110fe9..d7b35a8 100644 | |||
21 | + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | 20 | + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) |
22 | 21 | ||
23 | gdb-test: ${TCLTEST_EXE} | 22 | gdb-test: ${TCLTEST_EXE} |
24 | @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | 23 | @printf '%s ' set env @LD_LIBRARY_PATH_VAR@=\"`pwd`$${@LD_LIBRARY_PATH_VAR@:+:$${@LD_LIBRARY_PATH_VAR}}\" > gdb.run |
25 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | 24 | @@ -824,17 +824,17 @@ gdb-test: ${TCLTEST_EXE} |
26 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | 25 | @printf '\n' >>gdb.run |
26 | @printf '%s ' set args $(call shquotequote,$(TOP_DIR))/tests/all.tcl\ | ||
27 | $(call shquotequote,$(TESTFLAGS)) -singleproc 1 >> gdb.run | ||
27 | - $(GDB) ./${TCLTEST_EXE} --command=gdb.run | 28 | - $(GDB) ./${TCLTEST_EXE} --command=gdb.run |
28 | + $(GDB) ${TCLTEST_EXE} --command=gdb.run | 29 | + $(GDB) ${TCLTEST_EXE} --command=gdb.run |
29 | rm gdb.run | 30 | rm gdb.run |
@@ -41,7 +42,7 @@ index b110fe9..d7b35a8 100644 | |||
41 | 42 | ||
42 | # The following target generates the shared libraries in dltest/ that are used | 43 | # The following target generates the shared libraries in dltest/ that are used |
43 | # for testing; they are included as part of the "tcltest" target (via the | 44 | # for testing; they are included as part of the "tcltest" target (via the |
44 | @@ -848,28 +848,28 @@ dltest.marker: ${STUB_LIB_FILE} | 45 | @@ -852,28 +852,28 @@ dltest.marker: ${STUB_LIB_FILE} |
45 | # This target can be used to run tclsh from the build directory | 46 | # This target can be used to run tclsh from the build directory |
46 | # via `make shell SCRIPT=/tmp/foo.tcl` | 47 | # via `make shell SCRIPT=/tmp/foo.tcl` |
47 | shell: ${TCL_EXE} | 48 | shell: ${TCL_EXE} |
diff --git a/meta/recipes-devtools/tcltk/tcl/interp.patch b/meta/recipes-devtools/tcltk/tcl/interp.patch index 95d6318f64..2e0dc94cff 100644 --- a/meta/recipes-devtools/tcltk/tcl/interp.patch +++ b/meta/recipes-devtools/tcltk/tcl/interp.patch | |||
@@ -1,11 +1,19 @@ | |||
1 | From 426aa2ff62dda77fd011e8f630b9d4ea17984817 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Mon, 12 Jul 2021 14:50:13 +0100 | ||
4 | Subject: [PATCH] tcl: fix race in interp.test | ||
5 | |||
1 | The interp-36.7 patch has race conditions and is missing cleanup. This patch by | 6 | The interp-36.7 patch has race conditions and is missing cleanup. This patch by |
2 | a Tcl maintainer should improve matters. | 7 | a Tcl maintainer should improve matters. |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
11 | --- | ||
12 | tests/interp.test | 7 ++++--- | ||
13 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
6 | 14 | ||
7 | diff --git a/tests/interp.test b/tests/interp.test | 15 | diff --git a/tests/interp.test b/tests/interp.test |
8 | index d7424847f..fc90990f3 100644 | 16 | index d742484..fc90990 100644 |
9 | --- a/tests/interp.test | 17 | --- a/tests/interp.test |
10 | +++ b/tests/interp.test | 18 | +++ b/tests/interp.test |
11 | @@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { | 19 | @@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { |
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index 3123d289a1..a0195e263c 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From d6155ec08b355d64f1a7db407254d159037bb72a Mon Sep 17 00:00:00 2001 | 1 | From b89fd73daf9b3eb2f889f65baba5f90d8a930c82 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <rpurdie@linux.intel.com> | 2 | From: Richard Purdie <rpurdie@linux.intel.com> |
3 | Date: Wed, 9 Dec 2009 23:59:44 +0000 | 3 | Date: Wed, 9 Dec 2009 23:59:44 +0000 |
4 | Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function | 4 | Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | |||
8 | --- | 7 | --- |
9 | unix/Makefile.in | 5 ++++- | 8 | unix/Makefile.in | 5 ++++- |
10 | unix/tcl.m4 | 3 +++ | 9 | unix/tcl.m4 | 3 +++ |
11 | 2 files changed, 7 insertions(+), 1 deletion(-) | 10 | 2 files changed, 7 insertions(+), 1 deletion(-) |
12 | 11 | ||
13 | diff --git a/unix/Makefile.in b/unix/Makefile.in | 12 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
14 | index 398afd0..804532e 100644 | 13 | index 7619afc..9dd053d 100644 |
15 | --- a/unix/Makefile.in | 14 | --- a/unix/Makefile.in |
16 | +++ b/unix/Makefile.in | 15 | +++ b/unix/Makefile.in |
17 | @@ -893,7 +893,10 @@ install-binaries: binaries | 16 | @@ -904,7 +904,10 @@ install-binaries: binaries |
18 | done | 17 | done |
19 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | 18 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" |
20 | @@INSTALL_LIB@ | 19 | @@INSTALL_LIB@ |
@@ -27,10 +26,10 @@ index 398afd0..804532e 100644 | |||
27 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" | 26 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" |
28 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" | 27 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" |
29 | diff --git a/unix/tcl.m4 b/unix/tcl.m4 | 28 | diff --git a/unix/tcl.m4 b/unix/tcl.m4 |
30 | index f3d08ec..797c93f 100644 | 29 | index 0307a06..37c4d67 100644 |
31 | --- a/unix/tcl.m4 | 30 | --- a/unix/tcl.m4 |
32 | +++ b/unix/tcl.m4 | 31 | +++ b/unix/tcl.m4 |
33 | @@ -1382,6 +1382,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ | 32 | @@ -1378,6 +1378,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ |
34 | # get rid of the warnings. | 33 | # get rid of the warnings. |
35 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 34 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
36 | 35 | ||
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch index 99c5faf02c..93e7877256 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6efc98774681795712073c2b91e5e9d1763239b8 Mon Sep 17 00:00:00 2001 | 1 | From 050fc597fbfa4da2c31bd0df58c871892a490470 Mon Sep 17 00:00:00 2001 |
2 | From: "Song.Li" <Song.Li@windriver.com> | 2 | From: "Song.Li" <Song.Li@windriver.com> |
3 | Date: Wed, 1 Aug 2012 19:05:51 +0800 | 3 | Date: Wed, 1 Aug 2012 19:05:51 +0800 |
4 | Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target | 4 | Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target |
@@ -13,15 +13,14 @@ Signed-off-by: Song.Li <Song.Li@windriver.com> | |||
13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
15 | --- | 15 | --- |
16 | configure | 2 +- | 16 | unix/configure.in | 2 +- |
17 | configure.in | 2 +- | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | 18 | ||
20 | Index: unix/configure.in | 19 | diff --git a/unix/configure.in b/unix/configure.in |
21 | =================================================================== | 20 | index 4f62510..4974fb6 100644 |
22 | --- a/unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800 | 21 | --- a/unix/configure.in |
23 | +++ b/unix/configure.in 2013-11-10 23:39:41.199428131 -0800 | 22 | +++ b/unix/configure.in |
24 | @@ -790,7 +790,7 @@ | 23 | @@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
25 | 24 | ||
26 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 25 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
27 | 26 | ||
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb b/meta/recipes-devtools/tcltk/tcl_8.6.14.bb index 06bf900787..de4f5b878f 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.14.bb | |||
@@ -19,13 +19,12 @@ BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ | |||
19 | file://tcl-add-soname.patch" | 19 | file://tcl-add-soname.patch" |
20 | SRC_URI = "${BASE_SRC_URI} \ | 20 | SRC_URI = "${BASE_SRC_URI} \ |
21 | file://fix_non_native_build_issue.patch \ | 21 | file://fix_non_native_build_issue.patch \ |
22 | file://fix_issue_with_old_distro_glibc.patch \ | ||
23 | file://tcl-remove-hardcoded-install-path.patch \ | 22 | file://tcl-remove-hardcoded-install-path.patch \ |
24 | file://alter-includedir.patch \ | 23 | file://alter-includedir.patch \ |
25 | file://interp.patch \ | 24 | file://interp.patch \ |
26 | file://run-ptest \ | 25 | file://run-ptest \ |
27 | " | 26 | " |
28 | SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f4a6642" | 27 | SRC_URI[sha256sum] = "ff604f43862a778827d7ecd1ad7686950ac2ef48d9cf69d3424cea9de08d9a72" |
29 | 28 | ||
30 | SRC_URI:class-native = "${BASE_SRC_URI}" | 29 | SRC_URI:class-native = "${BASE_SRC_URI}" |
31 | 30 | ||