summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-12-12 13:55:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:25:49 +0000
commitb8ce0c92e27819cd3afab2fd6665325c3555a6c4 (patch)
tree22b1e80c8e36076588ba27c8181fbdde05bac3ab /meta
parent6c655dd32fffeb06744350d9dbdcf72c7e86b949 (diff)
downloadpoky-b8ce0c92e27819cd3afab2fd6665325c3555a6c4.tar.gz
tcl: upgrade 8.6.9 -> 8.6.10
Refresh patches: alter-includedir.patch tcl-remove-hardcoded-install-path.patch Backport a patch to fix tk build failure with cross compile: 0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch See: https://core.tcl-lang.org/tk/tktview/abd4abedd2f01c12839f0ad94564ae31137f7af5 (From OE-Core rev: f7226d8b28d7ee9292c53c8830c86c0619910f23) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch44
-rw-r--r--meta/recipes-devtools/tcltk/tcl/alter-includedir.patch5
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch15
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.10.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.6.9.bb)5
4 files changed, 58 insertions, 11 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch b/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch
new file mode 100644
index 0000000000..3cd34155ee
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch
@@ -0,0 +1,44 @@
1From f7fa48c4c75a1e748dc5071e709c0b62ff739eaa Mon Sep 17 00:00:00 2001
2From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
3Date: Mon, 9 Dec 2019 10:02:20 +0000
4Subject: [PATCH] Fix [abd4abedd2]: Failed to build tk 8.6.10 with cross
5 compile
6
7Upstream-Status: Backport
8[https://github.com/tcltk/tcl/commit/f7fa48c4c75a1e748dc5071e709c0b62ff739eaa]
9
10Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11---
12 compat/strtol.c | 2 +-
13 compat/strtoul.c | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/compat/strtol.c b/compat/strtol.c
17index b7f69196c..811006a64 100644
18--- a/compat/strtol.c
19+++ b/compat/strtol.c
20@@ -53,7 +53,7 @@ strtol(
21 */
22
23 p = string;
24- while (TclIsSpaceProc(*p)) {
25+ while (isspace(UCHAR(*p))) {
26 p += 1;
27 }
28
29diff --git a/compat/strtoul.c b/compat/strtoul.c
30index e37eb05f8..15587f1da 100644
31--- a/compat/strtoul.c
32+++ b/compat/strtoul.c
33@@ -74,7 +74,7 @@ strtoul(
34 */
35
36 p = string;
37- while (TclIsSpaceProc(*p)) {
38+ while (isspace(UCHAR(*p))) {
39 p += 1;
40 }
41 if (*p == '-') {
42--
432.17.1
44
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
index c8530e1f58..86632d9144 100644
--- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -8,6 +8,7 @@ Signed-off-by: Khem Raj <raj.khem@gmai.com>
8Fixed the TCL_INCLUDE_SPEC 8Fixed the TCL_INCLUDE_SPEC
9 9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11--- 12---
12 Makefile.in | 2 +- 13 Makefile.in | 2 +-
13 configure | 4 ++-- 14 configure | 4 ++--
@@ -34,7 +35,7 @@ index 3e78b49..24b3f92 100755
34@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 35@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
35 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 36 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
36 37
37 TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 38 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
38-PRIVATE_INCLUDE_DIR='$(includedir)' 39-PRIVATE_INCLUDE_DIR='$(includedir)'
39+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' 40+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
40 HTML_DIR='$(DISTDIR)/html' 41 HTML_DIR='$(DISTDIR)/html'
@@ -56,7 +57,7 @@ index 0e28b14..62d9b41 100755
56@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 57@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
57 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 58 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
58 59
59 TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 60 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
60-PRIVATE_INCLUDE_DIR='$(includedir)' 61-PRIVATE_INCLUDE_DIR='$(includedir)'
61+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' 62+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
62 HTML_DIR='$(DISTDIR)/html' 63 HTML_DIR='$(DISTDIR)/html'
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 16f7c80516..17d251d554 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
@@ -14,10 +14,11 @@ Upstream-Status: Inappropriate [configuration]
14 14
15Signed-off-by: Song.Li <Song.Li@windriver.com> 15Signed-off-by: Song.Li <Song.Li@windriver.com>
16Signed-off-by: Kai Kang <kai.kang@windriver.com> 16Signed-off-by: Kai Kang <kai.kang@windriver.com>
17 17Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
18--- 18---
19 configure | 2 +- 19 configure | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 configure.in | 2 +-
21 2 files changed, 2 insertions(+), 2 deletions(-)
21 22
22Index: unix/configure 23Index: unix/configure
23=================================================================== 24===================================================================
@@ -27,8 +28,8 @@ Index: unix/configure
27 28
28 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 29 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
29 30
30-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' 31-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
31+TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 32+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
32 PRIVATE_INCLUDE_DIR='$(includedir)' 33 PRIVATE_INCLUDE_DIR='$(includedir)'
33 HTML_DIR='$(DISTDIR)/html' 34 HTML_DIR='$(DISTDIR)/html'
34 35
@@ -40,8 +41,8 @@ Index: unix/configure.in
40 41
41 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 42 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
42 43
43-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' 44-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
44+TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 45+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
45 PRIVATE_INCLUDE_DIR='$(includedir)' 46 PRIVATE_INCLUDE_DIR='$(includedir)'
46 HTML_DIR='$(DISTDIR)/html' 47 HTML_DIR='$(DISTDIR)/html'
47 48
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.9.bb b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
index 7f3778153a..284f20e27a 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.9.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
@@ -22,10 +22,11 @@ SRC_URI = "${BASE_SRC_URI} \
22 file://no_packages.patch \ 22 file://no_packages.patch \
23 file://tcl-remove-hardcoded-install-path.patch \ 23 file://tcl-remove-hardcoded-install-path.patch \
24 file://alter-includedir.patch \ 24 file://alter-includedir.patch \
25 file://0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch;patchdir=.. \
25 file://run-ptest \ 26 file://run-ptest \
26" 27"
27SRC_URI[md5sum] = "aa0a121d95a0e7b73a036f26028538d4" 28SRC_URI[md5sum] = "97c55573f8520bcab74e21bfd8d0aadc"
28SRC_URI[sha256sum] = "ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e" 29SRC_URI[sha256sum] = "5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed"
29 30
30SRC_URI_class-native = "${BASE_SRC_URI}" 31SRC_URI_class-native = "${BASE_SRC_URI}"
31 32