mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

tcl: update 9.0.0 -> 9.0.1

Browse Source 
(From OE-Core rev: 8ddc1bdf45e39962338dc5ec51e4582d1f0c3d83)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2025-01-08 09:42:11 +01:00
committed by Richard Purdie
parent 9c80c18f82
commit bc7d32e16a
6 changed files with 32 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch
View File

@@ -1,8 +1,7 @@
From f69a01c5932af2d5ece6141e4424b14a2d645fd7 Mon Sep 17 00:00:00 2001
From 822a73a5dec13549cb20e6c7338b059ece2ea95a Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 9 Dec 2009 23:59:44 +0000
Subject: [PATCH 1/5] tcl: Add tcltk from OE.dev but with legacy staging
function
Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
Upstream-Status: Pending
---
@@ -11,10 +10,10 @@ Upstream-Status: Pending
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0ff1258..6e74458 100644
index b72b0da..2de7b2f 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1027,7 +1027,10 @@ install-binaries: binaries
@@ -1021,7 +1021,10 @@ install-binaries: binaries
done
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@@ -27,7 +26,7 @@ index 0ff1258..6e74458 100644
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 99bc8bf..7e6e0da 100644
index 4265832..49ad5ab 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1269,6 +1269,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
@@ -40,6 +39,3 @@ index 99bc8bf..7e6e0da 100644
SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
--
2.39.5

17
meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch
View File

@@ -1,7 +1,7 @@
From 61ef40f2bc418ce072828ad1939eaa40f981e76e Mon Sep 17 00:00:00 2001
From 363d9d8fb329b26d1e59ece7f269a7a28e6722c5 Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Fri, 13 Aug 2010 12:24:00 -0700
Subject: [PATCH 2/5] tcl: fix a build issue
Subject: [PATCH] tcl: fix a build issue
Upstream-Status: Inappropriate [upstream does not support installed tests]
---
@@ -9,10 +9,10 @@ Upstream-Status: Inappropriate [upstream does not support installed tests]
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6e74458..bd0b818 100644
index 2de7b2f..b5f9ab7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -918,7 +918,7 @@ tcltest-real:
@@ -912,7 +912,7 @@ tcltest-real:
test: test-tcl test-packages
test-tcl: ${TCLTEST_EXE}
@@ -21,7 +21,7 @@ index 6e74458..bd0b818 100644
gdb-test: ${TCLTEST_EXE}
$(SHELL_ENV) $(GDB) --args ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl \
@@ -928,15 +928,14 @@ lldb-test: ${TCLTEST_EXE}
@@ -922,15 +922,14 @@ lldb-test: ${TCLTEST_EXE}
$(SHELL_ENV) $(LLDB) -- ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl \
$(TESTFLAGS) -singleproc 1
@@ -39,7 +39,7 @@ index 6e74458..bd0b818 100644
# The following target generates the shared libraries in dltest/ that are used
# for testing; they are included as part of the "tcltest" target (via the
@@ -954,17 +953,17 @@ dltest.marker: ${STUB_LIB_FILE}
@@ -948,17 +947,17 @@ dltest.marker: ${STUB_LIB_FILE}
# This target can be used to run tclsh from the build directory
# via `make shell SCRIPT=/tmp/foo.tcl`
shell: ${TCL_EXE}
@@ -60,7 +60,7 @@ index 6e74458..bd0b818 100644
$(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
$(TESTFLAGS)
@@ -990,13 +989,13 @@ valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\
@@ -984,13 +983,13 @@ valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\
valgrindshell: ${TCL_EXE}
@@ -77,6 +77,3 @@ index 6e74458..bd0b818 100644
#--------------------------------------------------------------------------
# Installation rules
--
2.39.5

11
meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch
View File

@@ -1,7 +1,7 @@
From 8af08b6f1e566af239e36864823a96c2c283e4ea Mon Sep 17 00:00:00 2001
From 964b9649f8d044d38fdc8c4201075692e5f537a0 Mon Sep 17 00:00:00 2001
From: "Song.Li" <Song.Li@windriver.com>
Date: Wed, 1 Aug 2012 19:05:51 +0800
Subject: [PATCH 3/5] tcl:install tcl to lib64 instead of lib on 64bit target
Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target
Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}.
@@ -17,10 +17,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unix/configure.ac b/unix/configure.ac
index 461b394..b6d2506 100644
index 7f012d4..43ec7e4 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -753,7 +753,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
@@ -725,7 +725,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -29,6 +29,3 @@ index 461b394..b6d2506 100644
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
--
2.39.5

15
meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch
View File

@@ -1,7 +1,7 @@
From 20870e9cd4f5a211fe94f484f707269ee1abd947 Mon Sep 17 00:00:00 2001
From d2fa5a1efa5e4f07b294660c2513766c168137ce Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
Date: Tue, 22 Nov 2022 18:48:27 +0800
Subject: [PATCH 4/5] tcl: update the header location
Subject: [PATCH] tcl: update the header location
Lets install the include header and private header files into
usr/include/tcl8.6 when version of tcl is 8.6.x
@@ -26,7 +26,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/unix/Makefile.in b/unix/Makefile.in
index bd0b818..ddf2b67 100644
index b5f9ab7..fbc87a2 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -39,10 +39,10 @@ index bd0b818..ddf2b67 100644
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
diff --git a/unix/configure.ac b/unix/configure.ac
index b6d2506..72a8b0d 100644
index 43ec7e4..19524d1 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -754,7 +754,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
@@ -726,7 +726,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -51,7 +51,7 @@ index b6d2506..72a8b0d 100644
HTML_DIR='$(DISTDIR)/html'
# Note: in the following variable, it's important to use the absolute
@@ -921,7 +921,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
@@ -893,7 +893,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
# Install time header dir can be set via --includedir
@@ -73,6 +73,3 @@ index 9c6da82..8aa5ae8 100644
libfile=@TCL_LIB_FILE@
Name: Tool Command Language
--
2.39.5

21
meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch
View File

@@ -1,7 +1,7 @@
From 8a96171a33c886d1d9aab40e40f8aae2f621ca08 Mon Sep 17 00:00:00 2001
From fd75e3613613726786c54a25ee611c5176b33510 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Mon, 12 Jul 2021 14:50:13 +0100
Subject: [PATCH 5/5] tcl: fix race in interp.test
Subject: [PATCH] tcl: fix race in interp.test
The interp-36.7 patch has race conditions and is missing cleanup. This patch by
a Tcl maintainer should improve matters.
@@ -13,20 +13,20 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/interp.test b/tests/interp.test
index 30dc659..e7cd0ee 100644
index 0092a03..eecfd3b 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -3614,17 +3614,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
variable result
set result [lindex $args 0]
variable result
set result [lindex $args 0]
}
+ set tout [after 5000 {set result timeout}]
} -body {
child eval {
variable done {}
after 0 error foo
- after 10 [list ::set [namespace which -variable done] {}]
- vwait [namespace which -variable done]
variable done {}
after 0 error foo
- after 10 [list ::set [namespace which -variable done] {}]
- vwait [namespace which -variable done]
}
+ vwait result
set result
@@ -38,6 +38,3 @@ index 30dc659..e7cd0ee 100644
interp delete child
} -result foo
--
2.39.5

2
meta/recipes-devtools/tcltk/tcl_9.0.0.bb → meta/recipes-devtools/tcltk/tcl_9.0.1.bb
View File

@@ -23,7 +23,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \
file://0004-tcl-update-the-header-location.patch \
file://0005-tcl-fix-race-in-interp.test.patch \
"
SRC_URI[sha256sum] = "3186e23c7417359d90e3c46f531d442c76d3c05a2dba1081c02b75e32908b2b7"
SRC_URI[sha256sum] = "488fcb6c875a1762e9e8478319b20fbad9a31de475f056aeed94cc54b44cf221"
UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html"
UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src"