6 files changed, 0 insertions, 304 deletions

diff --git a/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch b/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch
deleted file mode 100644
index cefcb24433..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/0001-tcl-Add-tcltk-from-OE.dev-but-with-legacy-staging-fu.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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] tcl: add .0 to libtcl.so filename
-
-This patch is fixing the issue after the fact; the issue
-is that upstream defines the shared library filename as
-libtcl.so (without version) for all platforms in unix/tcl.m4,
-and I (AlexK) suspect they won't be interested in
-changing that.
-
-Upstream-Status: Inappropriate [see above]
----
- unix/Makefile.in | 5 ++++-
- unix/tcl.m4      | 3 +++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index b72b0da..2de7b2f 100644
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -1021,7 +1021,10 @@ install-binaries: binaries
-        done
-        @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
-        @@INSTALL_LIB@
--       @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
-+       mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
-+       ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
-+       ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
-+       @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
-        @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
-        @$(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 4265832..49ad5ab 100644
---- a/unix/tcl.m4
-+++ b/unix/tcl.m4
-@@ -1269,6 +1269,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
-            # get rid of the warnings.
-            #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
-+           # following line added by CW for Debian GNU/Linux
-+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
-+
-            SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
-            DL_OBJS="tclLoadDl.o"
-            DL_LIBS="-ldl"
diff --git a/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch b/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch
deleted file mode 100644
index a2d5622528..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/0002-tcl-fix-a-build-issue.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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] tcl: fix a build issue
-
-Upstream-Status: Inappropriate [upstream does not support installed tests]
----
- unix/Makefile.in | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index 2de7b2f..b5f9ab7 100644
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -912,7 +912,7 @@ tcltest-real:
- test: test-tcl test-packages
- 
- test-tcl: ${TCLTEST_EXE}
--       $(SHELL_ENV) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
-+       $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
- 
- gdb-test: ${TCLTEST_EXE}
-        $(SHELL_ENV) $(GDB) --args ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl \
-@@ -922,15 +922,14 @@ lldb-test: ${TCLTEST_EXE}
-        $(SHELL_ENV) $(LLDB) -- ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl \
-                $(TESTFLAGS) -singleproc 1
- 
--
- # Useful target to launch a built tcltest with the proper path,...
- runtest: ${TCLTEST_EXE}
--       $(SHELL_ENV) ./${TCLTEST_EXE}
-+       $(SHELL_ENV) ${TCLTEST_EXE}
- 
- # Useful target for running the test suite with an unwritable current
- # directory...
- ro-test: ${TCLTEST_EXE}
--       echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE}
-+       echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ${TCLTEST_EXE}
- 
- # 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
-@@ -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}
--       $(SHELL_ENV) ./${TCL_EXE} $(SCRIPT)
-+       $(SHELL_ENV) ${TCL_EXE} $(SCRIPT)
- 
- # This target can be used to run tclsh inside either gdb or insight
- gdb: ${TCL_EXE}
--       $(SHELL_ENV) $(GDB) ./${TCL_EXE}
-+       $(SHELL_ENV) $(GDB) ${TCL_EXE}
- 
- lldb: ${TCL_EXE}
-        $(SHELL_ENV) $(LLDB) ./${TCL_EXE}
- 
- valgrind: ${TCL_EXE} ${TCLTEST_EXE}
--       $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \
-+       $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} \
-                $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
-                $(TESTFLAGS)
- 
-@@ -984,13 +983,13 @@ valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\
- 
- 
- valgrindshell: ${TCL_EXE}
--       $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT)
-+       $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT)
- 
- trace-shell: ${TCL_EXE}
--       $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCL_EXE} $(SCRIPT)
-+       $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCL_EXE} $(SCRIPT)
- 
- trace-test: ${TCLTEST_EXE}
--       $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS)
-+       $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS)
- 
- #--------------------------------------------------------------------------
- # Installation rules
diff --git a/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch b/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch
deleted file mode 100644
index 8a425637c6..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/0003-tcl-install-tcl-to-lib64-instead-of-lib-on-64bit-tar.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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] tcl:install tcl to lib64 instead of lib on 64bit target
-
-Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}.
-
-[YOCTO #2876]
-
-Upstream-Status: Pending
-
-Signed-off-by: Song.Li <Song.Li@windriver.com>
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- unix/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unix/configure.ac b/unix/configure.ac
-index 7f012d4..43ec7e4 100644
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -725,7 +725,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
- 
- eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
- 
--test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
-+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
- PRIVATE_INCLUDE_DIR='$(includedir)'
- HTML_DIR='$(DISTDIR)/html'
- 
diff --git a/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch b/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch
deleted file mode 100644
index 50a4a27256..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/0004-tcl-update-the-header-location.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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] 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
-
-Upstream-Status: Inappropriate [Configuration Specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmai.com>
-
-Fixed the TCL_INCLUDE_SPEC
-
-Also update the header location in tcl.pc to correct the header
-location in case some package such python3 which use pkg-config
-to detect tcl doesn't find the header.
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- unix/Makefile.in  | 2 +-
- unix/configure.ac | 4 ++--
- unix/tcl.pc.in    | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index b5f9ab7..fbc87a2 100644
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR    = $(INSTALL_ROOT)$(TCL_LIBRARY)
- MODULE_INSTALL_DIR     = $(SCRIPT_INSTALL_DIR)/../tcl9
- 
- # Directory in which to install the include file tcl.h:
--INCLUDE_INSTALL_DIR    = $(INSTALL_ROOT)$(includedir)
-+INCLUDE_INSTALL_DIR    = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
- 
- # Path to the private tcl header dir:
- PRIVATE_INCLUDE_DIR    = @PRIVATE_INCLUDE_DIR@
-diff --git a/unix/configure.ac b/unix/configure.ac
-index 43ec7e4..19524d1 100644
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -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)'
--PRIVATE_INCLUDE_DIR='$(includedir)'
-+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
- HTML_DIR='$(DISTDIR)/html'
- 
- # Note:  in the following variable, it's important to use the absolute
-@@ -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
--eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
-+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
- 
- #------------------------------------------------------------------------
- # tclConfig.sh refers to this by a different name
-diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in
-index 9c6da82..8aa5ae8 100644
---- a/unix/tcl.pc.in
-+++ b/unix/tcl.pc.in
-@@ -3,7 +3,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/tcl@PACKAGE_VERSION@
- libfile=@TCL_LIB_FILE@
- 
- Name: Tool Command Language
diff --git a/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch b/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch
deleted file mode 100644
index 07912da5b3..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/0005-tcl-fix-race-in-interp.test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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] 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.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- tests/interp.test | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tests/interp.test b/tests/interp.test
-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]
-     }
-+    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]
-     }
-+    vwait result
-     set result
- } -cleanup {
-+    after cancel $tout
-     variable result {}
--    unset -nocomplain result
-+    unset -nocomplain result tout
-     interp delete child
- } -result foo
- 
diff --git a/meta/recipes-devtools/tcltk/tcl/run-ptest b/meta/recipes-devtools/tcltk/tcl/run-ptest
deleted file mode 100644
index be067f13ea..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/run-ptest
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-export TCL_LIBRARY=@libdir@/tcl/ptest/library
-export ERROR_ON_FAILURES=1
-export LANG=en-US.UTF-8
-
-# Some tests are overly strict with timings and fail on loaded systems.
-SKIP=""
-# 15321
-SKIP="$SKIP async-\* event-\*"
-# 14882
-SKIP="$SKIP cmdMZ-6.6"
-# 15081
-SKIP="$SKIP exit-1.\*"
-# 15407 15421
-SKIP="$SKIP \*io-46.1"
-# io-13.6 explicitly says it can fail on slow/loaded machines
-SKIP="$SKIP io-13.6"
-# 14825
-SKIP="$SKIP socket-\* socket_inet-\*"
-# tries to access google.com
-SKIP="$SKIP httpProxy-\*"
-
-for i in tests/*.test; do
-    i=$(basename $i)
-    ./tcltest tests/all.tcl -file $i -skip "$SKIP"
-    if [ $? -eq 0 ]; then
-        echo "PASS: $i"
-    else
-        echo "FAIL: $i"
-    fi
-done