summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
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.patch29
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.11.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.6.10.bb)4
3 files changed, 16 insertions, 61 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
deleted file mode 100644
index 3cd34155ee..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
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 86632d9144..66c395d401 100644
--- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -1,4 +1,4 @@
1Lets install the include header and private header files into 1Lets install the include header and private header files into
2usr/include/tcl8.6 when version of tcl is 8.6.x 2usr/include/tcl8.6 when version of tcl is 8.6.x
3 3
4Upstream-Status: Inappropriate [Configuration Specific] 4Upstream-Status: Inappropriate [Configuration Specific]
@@ -9,18 +9,19 @@ Fixed 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> 11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12
12--- 13---
13 Makefile.in | 2 +- 14 Makefile.in | 2 +-
14 configure | 4 ++-- 15 configure | 4 ++--
15 configure.in | 4 ++-- 16 configure.in | 4 ++--
16 3 files changed, 5 insertions(+), 5 deletions(-) 17 3 files changed, 5 insertions(+), 5 deletions(-)
17 18
18diff --git a/Makefile.in b/Makefile.in 19diff --git a/Makefile.in b/Makefile.in
19index 97b983b..dc2a4df 100644 20index 0370491..daa569a 100644
20--- a/Makefile.in 21--- a/Makefile.in
21+++ b/Makefile.in 22+++ b/Makefile.in
22@@ -53,7 +53,7 @@ DLL_INSTALL_DIR = @DLL_INSTALL_DIR@ 23@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
23 SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) 24 MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8
24 25
25 # Directory in which to install the include file tcl.h: 26 # Directory in which to install the include file tcl.h:
26-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) 27-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
@@ -29,10 +30,10 @@ index 97b983b..dc2a4df 100644
29 # Path to the private tcl header dir: 30 # Path to the private tcl header dir:
30 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ 31 PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
31diff --git a/configure b/configure 32diff --git a/configure b/configure
32index 3e78b49..24b3f92 100755 33index 181b9b3..f4cc225 100755
33--- a/configure 34--- a/configure
34+++ b/configure 35+++ b/configure
35@@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 36@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
36 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 37 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
37 38
38 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 39 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -41,7 +42,7 @@ index 3e78b49..24b3f92 100755
41 HTML_DIR='$(DISTDIR)/html' 42 HTML_DIR='$(DISTDIR)/html'
42 43
43 # Note: in the following variable, it's important to use the absolute 44 # Note: in the following variable, it's important to use the absolute
44@@ -19293,7 +19293,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 45@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
45 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" 46 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
46 47
47 # Install time header dir can be set via --includedir 48 # Install time header dir can be set via --includedir
@@ -51,10 +52,10 @@ index 3e78b49..24b3f92 100755
51 #------------------------------------------------------------------------ 52 #------------------------------------------------------------------------
52 # tclConfig.sh refers to this by a different name 53 # tclConfig.sh refers to this by a different name
53diff --git a/configure.in b/configure.in 54diff --git a/configure.in b/configure.in
54index 0e28b14..62d9b41 100755 55index 9f96e2b..e323e02 100644
55--- a/configure.in 56--- a/configure.in
56+++ b/configure.in 57+++ b/configure.in
57@@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 58@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
58 eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 59 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
59 60
60 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 61 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
@@ -63,7 +64,7 @@ index 0e28b14..62d9b41 100755
63 HTML_DIR='$(DISTDIR)/html' 64 HTML_DIR='$(DISTDIR)/html'
64 65
65 # Note: in the following variable, it's important to use the absolute 66 # Note: in the following variable, it's important to use the absolute
66@@ -912,7 +912,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 67@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
67 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" 68 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
68 69
69 # Install time header dir can be set via --includedir 70 # Install time header dir can be set via --includedir
@@ -73,5 +74,5 @@ index 0e28b14..62d9b41 100755
73 #------------------------------------------------------------------------ 74 #------------------------------------------------------------------------
74 # tclConfig.sh refers to this by a different name 75 # tclConfig.sh refers to this by a different name
75-- 76--
761.7.10.4 772.25.1
77 78
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
index e6feb25a7e..74bdb098c6 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb
@@ -22,11 +22,9 @@ 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=.. \
26 file://run-ptest \ 25 file://run-ptest \
27" 26"
28SRC_URI[md5sum] = "97c55573f8520bcab74e21bfd8d0aadc" 27SRC_URI[sha256sum] = "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
29SRC_URI[sha256sum] = "5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed"
30 28
31SRC_URI_class-native = "${BASE_SRC_URI}" 29SRC_URI_class-native = "${BASE_SRC_URI}"
32 30