diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-devtools/tcltk/tcl | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-devtools/tcltk/tcl')
4 files changed, 65 insertions, 14 deletions
diff --git a/external/poky/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch b/external/poky/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch new file mode 100644 index 00000000..3cd34155 --- /dev/null +++ b/external/poky/meta/recipes-devtools/tcltk/tcl/0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch @@ -0,0 +1,44 @@ +From f7fa48c4c75a1e748dc5071e709c0b62ff739eaa Mon Sep 17 00:00:00 2001 +From: "jan.nijtmans" <nijtmans@users.sourceforge.net> +Date: Mon, 9 Dec 2019 10:02:20 +0000 +Subject: [PATCH] Fix [abd4abedd2]: Failed to build tk 8.6.10 with cross + compile + +Upstream-Status: Backport +[https://github.com/tcltk/tcl/commit/f7fa48c4c75a1e748dc5071e709c0b62ff739eaa] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + compat/strtol.c | 2 +- + compat/strtoul.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compat/strtol.c b/compat/strtol.c +index b7f69196c..811006a64 100644 +--- a/compat/strtol.c ++++ b/compat/strtol.c +@@ -53,7 +53,7 @@ strtol( + */ + + p = string; +- while (TclIsSpaceProc(*p)) { ++ while (isspace(UCHAR(*p))) { + p += 1; + } + +diff --git a/compat/strtoul.c b/compat/strtoul.c +index e37eb05f8..15587f1da 100644 +--- a/compat/strtoul.c ++++ b/compat/strtoul.c +@@ -74,7 +74,7 @@ strtoul( + */ + + p = string; +- while (TclIsSpaceProc(*p)) { ++ while (isspace(UCHAR(*p))) { + p += 1; + } + if (*p == '-') { +-- +2.17.1 + diff --git a/external/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/external/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index c8530e1f..86632d91 100644 --- a/external/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/external/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -8,6 +8,7 @@ Signed-off-by: Khem Raj <raj.khem@gmai.com> Fixed the TCL_INCLUDE_SPEC Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- Makefile.in | 2 +- configure | 4 ++-- @@ -34,7 +35,7 @@ index 3e78b49..24b3f92 100755 @@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" - TCL_LIBRARY='$(libdir)/tcl$(VERSION)' + test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' -PRIVATE_INCLUDE_DIR='$(includedir)' +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' HTML_DIR='$(DISTDIR)/html' @@ -56,7 +57,7 @@ index 0e28b14..62d9b41 100755 @@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" - TCL_LIBRARY='$(libdir)/tcl$(VERSION)' + test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' -PRIVATE_INCLUDE_DIR='$(includedir)' +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' HTML_DIR='$(DISTDIR)/html' diff --git a/external/poky/meta/recipes-devtools/tcltk/tcl/run-ptest b/external/poky/meta/recipes-devtools/tcltk/tcl/run-ptest index dadba655..22bb69ae 100644 --- a/external/poky/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/external/poky/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -1,8 +1,13 @@ #!/bin/sh -for i in `ls tests/*.test |awk -F/ '{print $2}'`; \ - do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.tmp 2>&1; \ - grep -q "^Files with failing tests:" $i.tmp; \ - if [ $? -eq 0 ]; then echo "FAIL: $i"; \ - else echo "PASS: $i"; rm -f $i.tmp; fi; \ +for i in `ls tests/*.test | awk -F/ '{print $2}'`; do + TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.log 2>&1 + grep -q "^Files with failing tests:" $i.log + if [ $? -eq 0 ]; then + echo "FAIL: $i" + cat $i.log + else + echo "PASS: $i" + fi + rm -f $i.log done diff --git a/external/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/external/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch index 16f7c805..17d251d5 100644 --- a/external/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch +++ b/external/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch @@ -14,10 +14,11 @@ Upstream-Status: Inappropriate [configuration] 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> --- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) Index: unix/configure =================================================================== @@ -27,8 +28,8 @@ Index: unix/configure eval "TCL_LIB_FILE=${TCL_LIB_FILE}" --TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' -+TCL_LIBRARY='$(libdir)/tcl$(VERSION)' +-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' @@ -40,8 +41,8 @@ Index: unix/configure.in eval "TCL_LIB_FILE=${TCL_LIB_FILE}" --TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' -+TCL_LIBRARY='$(libdir)/tcl$(VERSION)' +-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' |