summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch6
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch8
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch4
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/interp.patch6
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/run-ptest2
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch4
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch4
-rw-r--r--meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb (renamed from meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb)4
8 files changed, 20 insertions, 18 deletions
diff --git a/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch b/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
index 1859992838..6ba7ff4340 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
@@ -1,4 +1,4 @@
1From ff508f2e6786df697876140f21855ecb92a3ed36 Mon Sep 17 00:00:00 2001 1From 7d404d1827ffb69a2aa7b60c10b435c6f47f7bfb Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 18 Aug 2023 12:25:11 +0200 3Date: Fri, 18 Aug 2023 12:25:11 +0200
4Subject: [PATCH] generic/tcl.h: use Tcl_WideInt for seconds in Tcl_Time 4Subject: [PATCH] generic/tcl.h: use Tcl_WideInt for seconds in Tcl_Time
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/generic/tcl.h b/generic/tcl.h 21diff --git a/generic/tcl.h b/generic/tcl.h
22index 3a4622e..6204c57 100644 22index d8fd70a..ffff4b1 100644
23--- a/generic/tcl.h 23--- a/generic/tcl.h
24+++ b/generic/tcl.h 24+++ b/generic/tcl.h
25@@ -1418,7 +1418,7 @@ typedef enum { 25@@ -1425,7 +1425,7 @@ typedef enum {
26 */ 26 */
27 27
28 typedef struct Tcl_Time { 28 typedef struct Tcl_Time {
diff --git a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
index 6ceb297cea..ad91b9ffb3 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
@@ -1,4 +1,4 @@
1From 8bb8174e13c1c0e3b27fdf96a393f9fb1b7e14be Mon Sep 17 00:00:00 2001 1From bfca2e4ae32ab546f796d9c7ff7cbf542d5b2bfe Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 22 Nov 2022 18:48:27 +0800 3Date: Tue, 22 Nov 2022 18:48:27 +0800
4Subject: [PATCH] tcl: update the header location 4Subject: [PATCH] tcl: update the header location
@@ -26,7 +26,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
26 3 files changed, 4 insertions(+), 4 deletions(-) 26 3 files changed, 4 insertions(+), 4 deletions(-)
27 27
28diff --git a/unix/Makefile.in b/unix/Makefile.in 28diff --git a/unix/Makefile.in b/unix/Makefile.in
29index c3b75e3..60ed93e 100644 29index 45e7b76..5a46e6a 100644
30--- a/unix/Makefile.in 30--- a/unix/Makefile.in
31+++ b/unix/Makefile.in 31+++ b/unix/Makefile.in
32@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) 32@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -39,7 +39,7 @@ index c3b75e3..60ed93e 100644
39 # Path to the private tcl header dir: 39 # Path to the private tcl header dir:
40 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ 40 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
41diff --git a/unix/configure.in b/unix/configure.in 41diff --git a/unix/configure.in b/unix/configure.in
42index 8e6726b..2345689 100644 42index 50b3e03..8a33d0c 100644
43--- a/unix/configure.in 43--- a/unix/configure.in
44+++ b/unix/configure.in 44+++ b/unix/configure.in
45@@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 45@@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
@@ -51,7 +51,7 @@ index 8e6726b..2345689 100644
51 HTML_DIR='$(DISTDIR)/html' 51 HTML_DIR='$(DISTDIR)/html'
52 52
53 # 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
54@@ -898,7 +898,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 54@@ -896,7 +896,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
55 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}"
56 56
57 # 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/tcltk8/tcl8/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch
index 61153878fe..07a1f4d040 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch
@@ -1,4 +1,4 @@
1From 3d11e7fd9aba6251974d990286347c06582e87b9 Mon Sep 17 00:00:00 2001 1From ad7847a15163f12c24d8ecb50dffa289876dc830 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
@@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
10 1 file changed, 10 insertions(+), 10 deletions(-) 10 1 file changed, 10 insertions(+), 10 deletions(-)
11 11
12diff --git a/unix/Makefile.in b/unix/Makefile.in 12diff --git a/unix/Makefile.in b/unix/Makefile.in
13index a2f9e21..c3b75e3 100644 13index ab2e7b5..45e7b76 100644
14--- a/unix/Makefile.in 14--- a/unix/Makefile.in
15+++ b/unix/Makefile.in 15+++ b/unix/Makefile.in
16@@ -723,7 +723,7 @@ tcltest-real: 16@@ -723,7 +723,7 @@ tcltest-real:
diff --git a/meta/recipes-devtools/tcltk8/tcl8/interp.patch b/meta/recipes-devtools/tcltk8/tcl8/interp.patch
index aeebb038e3..c6412e7775 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/interp.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/interp.patch
@@ -1,4 +1,4 @@
1From 09049beed723243d092ffaa37939dfe0f2ed6828 Mon Sep 17 00:00:00 2001 1From 2d959d1fdfbd7e020f5177b1a7ff6a08809536ca Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com> 2From: Ross Burton <ross.burton@arm.com>
3Date: Mon, 12 Jul 2021 14:50:13 +0100 3Date: Mon, 12 Jul 2021 14:50:13 +0100
4Subject: [PATCH] tcl: fix race in interp.test 4Subject: [PATCH] tcl: fix race in interp.test
@@ -13,10 +13,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
13 1 file changed, 4 insertions(+), 3 deletions(-) 13 1 file changed, 4 insertions(+), 3 deletions(-)
14 14
15diff --git a/tests/interp.test b/tests/interp.test 15diff --git a/tests/interp.test b/tests/interp.test
16index 24ffb1b..c6460ad 100644 16index d64fdd4..9931dd1 100644
17--- a/tests/interp.test 17--- a/tests/interp.test
18+++ b/tests/interp.test 18+++ b/tests/interp.test
19@@ -3614,17 +3614,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { 19@@ -3651,17 +3651,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
20 variable result 20 variable result
21 set result [lindex $args 0] 21 set result [lindex $args 0]
22 } 22 }
diff --git a/meta/recipes-devtools/tcltk8/tcl8/run-ptest b/meta/recipes-devtools/tcltk8/tcl8/run-ptest
index 687e06fa4b..12921d8cfd 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/run-ptest
+++ b/meta/recipes-devtools/tcltk8/tcl8/run-ptest
@@ -4,6 +4,8 @@
4export TZ="Europe/London" 4export TZ="Europe/London"
5export TCL_LIBRARY=@libdir@/tcl8/ptest/library 5export TCL_LIBRARY=@libdir@/tcl8/ptest/library
6export ERROR_ON_FAILURES=1 6export ERROR_ON_FAILURES=1
7export LC_ALL=en_US.UTF-8
8export LANG=en_US.UTF-8
7 9
8# Some tests are overly strict with timings and fail on loaded systems. 10# Some tests are overly strict with timings and fail on loaded systems.
9SKIP="" 11SKIP=""
diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
index 898e8241fc..0f8bd062ac 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
@@ -1,4 +1,4 @@
1From 0d8e567d132e050c5d4a8d8d9257417e0679483c Mon Sep 17 00:00:00 2001 1From 2af07e2d0f0cb9f42ff982ce257e2067dcf1ec77 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <rpurdie@linux.intel.com> 2From: Richard Purdie <rpurdie@linux.intel.com>
3Date: Wed, 9 Dec 2009 23:59:44 +0000 3Date: Wed, 9 Dec 2009 23:59:44 +0000
4Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function 4Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
@@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11 2 files changed, 7 insertions(+), 1 deletion(-) 11 2 files changed, 7 insertions(+), 1 deletion(-)
12 12
13diff --git a/unix/Makefile.in b/unix/Makefile.in 13diff --git a/unix/Makefile.in b/unix/Makefile.in
14index bc743b3..a2f9e21 100644 14index 3efdfec..ab2e7b5 100644
15--- a/unix/Makefile.in 15--- a/unix/Makefile.in
16+++ b/unix/Makefile.in 16+++ b/unix/Makefile.in
17@@ -812,7 +812,10 @@ install-binaries: binaries 17@@ -812,7 +812,10 @@ install-binaries: binaries
diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
index f2a37add7d..12e1937aa1 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
@@ -1,4 +1,4 @@
1From 6e3cbc3600ac474776e92eb9a88abcb74299c321 Mon Sep 17 00:00:00 2001 1From 0b479a0dc845f9926cb40c13d86e55391a89fe98 Mon Sep 17 00:00:00 2001
2From: "Song.Li" <Song.Li@windriver.com> 2From: "Song.Li" <Song.Li@windriver.com>
3Date: Wed, 1 Aug 2012 19:05:51 +0800 3Date: Wed, 1 Aug 2012 19:05:51 +0800
4Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target 4Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target
@@ -17,7 +17,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/unix/configure.in b/unix/configure.in 19diff --git a/unix/configure.in b/unix/configure.in
20index e88ec3c..8e6726b 100644 20index ed07ca5..50b3e03 100644
21--- a/unix/configure.in 21--- a/unix/configure.in
22+++ b/unix/configure.in 22+++ b/unix/configure.in
23@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 23@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
index 225f04be48..b97b20abd5 100644
--- a/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb
+++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
@@ -25,7 +25,7 @@ SRC_URI = "${BASE_SRC_URI} \
25 file://run-ptest \ 25 file://run-ptest \
26 file://0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch \ 26 file://0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch \
27 " 27 "
28SRC_URI[sha256sum] = "3b371386a9a928eecdbf263bcab7d6a531e620ca3fbab4fdeeb3d6a9a56f38e9" 28SRC_URI[sha256sum] = "a1d8cbe44b38beaa29fc2130c4e7b79b8bf02e2bcc028ffefd7a25a2122202a0"
29 29
30SRC_URI:class-native = "${BASE_SRC_URI}" 30SRC_URI:class-native = "${BASE_SRC_URI}"
31 31
@@ -74,7 +74,7 @@ FILES:${PN}-dev += "${libdir}/tcl8Config.sh ${libdir}/tcl8ooConfig.sh"
74 74
75# isn't getting picked up by shlibs code 75# isn't getting picked up by shlibs code
76RDEPENDS:${PN} += "tcl8-lib" 76RDEPENDS:${PN} += "tcl8-lib"
77RDEPENDS:${PN}-ptest += "libgcc" 77RDEPENDS:${PN}-ptest += "libgcc locale-base-en-us tzdata"
78 78
79BBCLASSEXTEND = "native nativesdk" 79BBCLASSEXTEND = "native nativesdk"
80 80