Signed-off-by: Alexander Kanavin <[email protected]> --- .../tcltk/tcl/alter-includedir.patch | 18 ++++++++---------- .../tcltk/tcl/fix_non_native_build_issue.patch | 11 +++++++---- .../tcltk/{tcl_8.6.12.bb => tcl_8.6.13.bb} | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) rename meta/recipes-devtools/tcltk/{tcl_8.6.12.bb => tcl_8.6.13.bb} (97%)
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 26c9b0d7fa..96d0ab2ad4 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -1,4 +1,4 @@ -From c6960f4ca82a153416d138221dd2426475aed683 Mon Sep 17 00:00:00 2001 +From 27e5595c065ce3af687818555a882ab5e1dfbc2b Mon Sep 17 00:00:00 2001 From: Mingli Yu <[email protected]> Date: Tue, 22 Nov 2022 18:48:27 +0800 Subject: [PATCH] tcl: update the header location @@ -19,6 +19,7 @@ to detect tcl doesn't find the header. Signed-off-by: Robert Yang <[email protected]> Signed-off-by: Yi Zhao <[email protected]> Signed-off-by: Mingli Yu <[email protected]> + --- unix/Makefile.in | 2 +- unix/configure.in | 4 ++-- @@ -26,7 +27,7 @@ Signed-off-by: Mingli Yu <[email protected]> 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 0ebac43..b0c3ee0 100644 +index 0b8179f..4824b28 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) @@ -39,10 +40,10 @@ index 0ebac43..b0c3ee0 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ diff --git a/unix/configure.in b/unix/configure.in -index 9f96e2b..e323e02 100644 +index 0354a0b..2d0c00f 100644 --- a/unix/configure.in +++ b/unix/configure.in -@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' @@ -51,7 +52,7 @@ index 9f96e2b..e323e02 100644 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -895,7 +895,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 @@ -61,7 +62,7 @@ index 9f96e2b..e323e02 100644 #------------------------------------------------------------------------ # tclConfig.sh refers to this by a different name diff --git a/unix/tcl.pc.in b/unix/tcl.pc.in -index 846cb11..72ca44b 100644 +index 93b5e69..dcd51d7 100644 --- a/unix/tcl.pc.in +++ b/unix/tcl.pc.in @@ -3,7 +3,7 @@ @@ -70,9 +71,6 @@ index 846cb11..72ca44b 100644 libdir=@libdir@ -includedir=@includedir@ +includedir=@includedir@/tcl@PACKAGE_VERSION@ + libfile=@TCL_LIB_FILE@ Name: Tool Command Language - Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses. --- -2.25.1 - diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index 41aefd1deb..6dbef7077f 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -1,4 +1,4 @@ -From 34c3a1adc1bfd13fb877179c37ef74a108f2a749 Mon Sep 17 00:00:00 2001 +From 8a6c77cdd265fe7ce35929f58f1ade0c6bc4025b Mon Sep 17 00:00:00 2001 From: Nitin A Kamble <[email protected]> Date: Fri, 13 Aug 2010 12:24:00 -0700 Subject: [PATCH] tcl: fix a build issue @@ -10,10 +10,10 @@ Upstream-Status: Inappropriate [upstream does not support installed tests] 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 804532e..a9cb339 100644 +index b110fe9..d7b35a8 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -810,23 +810,23 @@ tcltest-real: +@@ -814,23 +814,23 @@ tcltest-real: test: test-tcl test-packages test-tcl: ${TCLTEST_EXE} @@ -41,7 +41,7 @@ index 804532e..a9cb339 100644 # 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 -@@ -844,25 +844,25 @@ dltest.marker: ${STUB_LIB_FILE} +@@ -848,28 +848,28 @@ 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} @@ -53,6 +53,9 @@ index 804532e..a9cb339 100644 - $(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} \ diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.12.bb b/meta/recipes-devtools/tcltk/tcl_8.6.13.bb similarity index 97% rename from meta/recipes-devtools/tcltk/tcl_8.6.12.bb rename to meta/recipes-devtools/tcltk/tcl_8.6.13.bb index 824c0286c6..982f370edb 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.12.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.13.bb @@ -25,7 +25,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://interp.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "186748f1131cef3d637421a18d70892f808e526a29c694bebfeb1c540f98727c" +SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f4a6642" SRC_URI:class-native = "${BASE_SRC_URI}" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174518): https://lists.openembedded.org/g/openembedded-core/message/174518 Mute This Topic: https://lists.openembedded.org/mt/95642218/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
