summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2024-09-22 11:31:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-30 17:00:50 +0100
commit2f0d7eb2b90d2326cf22e36f2195f1178c87d5f5 (patch)
treeff7d4e559f597b7a8288ab8b37963236ac2e1f23
parentb076530cbb27666dc4d86d2b69747239031eb621 (diff)
downloadpoky-2f0d7eb2b90d2326cf22e36f2195f1178c87d5f5.tar.gz
tcl: upgrade 8.6.14 -> 8.6.15
Release Notes: https://sourceforge.net/p/tcl/mailman/message/58817026/ (From OE-Core rev: 4b9be8f4e71f1c58e07cb918826770d0d208a0fb) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch14
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.15.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.6.14.bb)2
2 files changed, 8 insertions, 8 deletions
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 09c49daa2c..fac7ed7e28 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,4 +1,4 @@
1From 371aa300369e9ea3234cba22d5c0babc7d40dfdf Mon Sep 17 00:00:00 2001 1From bd512547fc002fdb20808bf5b8b9feeb848b6512 Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com> 2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Fri, 13 Aug 2010 12:24:00 -0700 3Date: Fri, 13 Aug 2010 12:24:00 -0700
4Subject: [PATCH] tcl: fix a build issue 4Subject: [PATCH] tcl: fix a build issue
@@ -9,10 +9,10 @@ Upstream-Status: Inappropriate [upstream does not support installed tests]
9 1 file changed, 10 insertions(+), 10 deletions(-) 9 1 file changed, 10 insertions(+), 10 deletions(-)
10 10
11diff --git a/unix/Makefile.in b/unix/Makefile.in 11diff --git a/unix/Makefile.in b/unix/Makefile.in
12index 9dd053d..a3b7d69 100644 12index 965f6da..a0bd63f 100644
13--- a/unix/Makefile.in 13--- a/unix/Makefile.in
14+++ b/unix/Makefile.in 14+++ b/unix/Makefile.in
15@@ -815,7 +815,7 @@ tcltest-real: 15@@ -723,7 +723,7 @@ tcltest-real:
16 test: test-tcl test-packages 16 test: test-tcl test-packages
17 17
18 test-tcl: ${TCLTEST_EXE} 18 test-tcl: ${TCLTEST_EXE}
@@ -21,7 +21,7 @@ index 9dd053d..a3b7d69 100644
21 21
22 gdb-test: ${TCLTEST_EXE} 22 gdb-test: ${TCLTEST_EXE}
23 @printf '%s ' set env @LD_LIBRARY_PATH_VAR@=\"`pwd`$${@LD_LIBRARY_PATH_VAR@:+:$${@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
24@@ -824,17 +824,17 @@ gdb-test: ${TCLTEST_EXE} 24@@ -732,17 +732,17 @@ gdb-test: ${TCLTEST_EXE}
25 @printf '\n' >>gdb.run 25 @printf '\n' >>gdb.run
26 @printf '%s ' set args $(call shquotequote,$(TOP_DIR))/tests/all.tcl\ 26 @printf '%s ' set args $(call shquotequote,$(TOP_DIR))/tests/all.tcl\
27 $(call shquotequote,$(TESTFLAGS)) -singleproc 1 >> gdb.run 27 $(call shquotequote,$(TESTFLAGS)) -singleproc 1 >> gdb.run
@@ -37,12 +37,12 @@ index 9dd053d..a3b7d69 100644
37 # Useful target for running the test suite with an unwritable current 37 # Useful target for running the test suite with an unwritable current
38 # directory... 38 # directory...
39 ro-test: ${TCLTEST_EXE} 39 ro-test: ${TCLTEST_EXE}
40- echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE} 40- echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source -encoding utf-8 ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE}
41+ echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ${TCLTEST_EXE} 41+ echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source -encoding utf-8 ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ${TCLTEST_EXE}
42 42
43 # 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
44 # 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
45@@ -852,28 +852,28 @@ dltest.marker: ${STUB_LIB_FILE} 45@@ -760,28 +760,28 @@ dltest.marker: ${STUB_LIB_FILE}
46 # 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
47 # via `make shell SCRIPT=/tmp/foo.tcl` 47 # via `make shell SCRIPT=/tmp/foo.tcl`
48 shell: ${TCL_EXE} 48 shell: ${TCL_EXE}
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.14.bb b/meta/recipes-devtools/tcltk/tcl_8.6.15.bb
index de4f5b878f..340854056e 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.14.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.15.bb
@@ -24,7 +24,7 @@ SRC_URI = "${BASE_SRC_URI} \
24 file://interp.patch \ 24 file://interp.patch \
25 file://run-ptest \ 25 file://run-ptest \
26 " 26 "
27SRC_URI[sha256sum] = "ff604f43862a778827d7ecd1ad7686950ac2ef48d9cf69d3424cea9de08d9a72" 27SRC_URI[sha256sum] = "844775491e435e34d83d6ccfbadd1342f1855f1705253233a86152df0765e78d"
28 28
29SRC_URI:class-native = "${BASE_SRC_URI}" 29SRC_URI:class-native = "${BASE_SRC_URI}"
30 30