From patchwork Tue Dec 17 08:58:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 54212 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBC94E77186 for ; Tue, 17 Dec 2024 08:58:45 +0000 (UTC) Received: from esa10.hc1455-7.c3s2.iphmx.com (esa10.hc1455-7.c3s2.iphmx.com [139.138.36.225]) by mx.groups.io with SMTP id smtpd.web10.77347.1734425914528569039 for ; Tue, 17 Dec 2024 00:58:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=fj2 header.b=Q30Ls5AO; spf=pass (domain: fujitsu.com, ip: 139.138.36.225, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1734425921; x=1765961921; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=JeWqvHg8krwZD0o1OJDqcQFDKug+vekgaL3yGQSVB+k=; b=Q30Ls5AOmy2aGgIyquuRoIfao393Zoy5J7MJp6RZxKTvg5GWDOeRjhjW /WpjZe4dGd1MF1QjEf16rXJrJrbd4p26+XENLc4Mn7fZPo3K7QxUOMjRw bPedgy+iwXDx2qBmWDYerKEUjFS8WHVAlnPiYopklbgO0ntQp3/9IZmUs Z+G0WM+5/oJBoPSxCoYPJQ2FSz+313QOTfFda4CWQlZr4Qs0ytvkL5YAs ZglY8J0hpDxn6uEi8EQDXVvStywWDlJ0E530gtOMhiOXQUTRtPC2QNqOW wQ0lg4kMG30USLpLblH87KJmQowDPsRM+g5fuOBs4raM6fpbDkrDSarHO Q==; X-CSE-ConnectionGUID: jN1Bj3eaTjCJp2VkpFluuQ== X-CSE-MsgGUID: Z7VbTxmTTjmZzLvTm9c22g== X-IronPort-AV: E=McAfee;i="6700,10204,11288"; a="171353589" X-IronPort-AV: E=Sophos;i="6.12,241,1728918000"; d="scan'208";a="171353589" Received: from unknown (HELO oym-r2.gw.nic.fujitsu.com) ([210.162.30.90]) by esa10.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2024 17:58:40 +0900 Received: from oym-m1.gw.nic.fujitsu.com (oym-nat-oym-m1.gw.nic.fujitsu.com [192.168.87.58]) by oym-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 08909D4C2B for ; Tue, 17 Dec 2024 17:58:38 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by oym-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id D0AD6D9003 for ; Tue, 17 Dec 2024 17:58:37 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 39949E292A for ; Tue, 17 Dec 2024 17:58:37 +0900 (JST) Received: from localhost.localdomain.localdomain (unknown [10.193.128.200]) by edo.cn.fujitsu.com (Postfix) with ESMTP id D71DA1A000B; Tue, 17 Dec 2024 16:58:36 +0800 (CST) From: wangmy@fujitsu.com To: openembedded-core@lists.openembedded.org Cc: Wang Mingyu Subject: [OE-core] [PATCH 21/21] tcl8: upgrade 8.6.15 -> 8.6.16 Date: Tue, 17 Dec 2024 16:58:07 +0800 Message-Id: <1734425887-18069-21-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1734425887-18069-1-git-send-email-wangmy@fujitsu.com> References: <1734425887-18069-1-git-send-email-wangmy@fujitsu.com> X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28864.006 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28864.006 X-TMASE-Result: 10--6.585200-10.000000 X-TMASE-MatchedRID: xNkyGzs1zQGjz0nOeth/yfFHqn2upg6O1QQ6Jx/fflafHrjLA9DhZjBX Xb/qS263ZHp0JfxC6Sx527+BW5DJ4FpCIuRr0RxKuce7gFxhKa3Vy4hHC3/gyMC5DTEMxpeQFH0 IKehhaoajMr48mwgBwJaW6G0nndVExBNI9kTkfyDJ1E/nrJFED03yuY9BGW8rjCcYoCggoksTJJ UiwVQd0UBh0sVevfs+7J9T8jTffriCZTEvplyDNOOnF2j8nBWbgbNN0R684zNIjgSkT0bjaqPFj JEFr+olwXCBO/GKkVr3FLeZXNZS4DjAdLIal4R688+pBI7LOnpuuNX9qmsQuJowqBJzwlR6KR5C 6/swxMxbwE26BScMoA== X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Dec 2024 08:58:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208824 From: Wang Mingyu alter-includedir.patch interp.patch tcl-add-soname.patch tcl-remove-hardcoded-install-path.patch refreshed for 8.6.16 Signed-off-by: Wang Mingyu --- .../tcltk8/tcl8/alter-includedir.patch | 10 +++++----- meta/recipes-devtools/tcltk8/tcl8/interp.patch | 6 +++--- meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch | 8 ++++---- .../tcl8/tcl-remove-hardcoded-install-path.patch | 6 +++--- .../tcltk8/{tcl8_8.6.15.bb => tcl8_8.6.16.bb} | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) rename meta/recipes-devtools/tcltk8/{tcl8_8.6.15.bb => tcl8_8.6.16.bb} (98%) diff --git a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch index bfc718cfd3..c5005cb4a8 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch @@ -1,4 +1,4 @@ -From 3130dca60636dc12d0d12df75b002fd123349e21 Mon Sep 17 00:00:00 2001 +From ca538ba69b808b4e68ddcbea89a22f68ef4e4b4f Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 22 Nov 2022 18:48:27 +0800 Subject: [PATCH] tcl: update the header location @@ -26,7 +26,7 @@ Signed-off-by: Mingli Yu 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index a3b7d69..969ddb8 100644 +index c3b75e3..60ed93e 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) @@ -39,10 +39,10 @@ index a3b7d69..969ddb8 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 4974fb6..a72934f 100644 +index 8e6726b..2345689 100644 --- a/unix/configure.in +++ b/unix/configure.in -@@ -776,7 +776,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" +@@ -775,7 +775,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 +51,7 @@ index 4974fb6..a72934f 100644 HTML_DIR='$(DISTDIR)/html' # Note: in the following variable, it's important to use the absolute -@@ -897,7 +897,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +@@ -898,7 +898,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 diff --git a/meta/recipes-devtools/tcltk8/tcl8/interp.patch b/meta/recipes-devtools/tcltk8/tcl8/interp.patch index 2e0dc94cff..d5d2b1821b 100644 --- a/meta/recipes-devtools/tcltk8/tcl8/interp.patch +++ b/meta/recipes-devtools/tcltk8/tcl8/interp.patch @@ -1,4 +1,4 @@ -From 426aa2ff62dda77fd011e8f630b9d4ea17984817 Mon Sep 17 00:00:00 2001 +From d17505bf4630d9c432e897b5b3abb2a28f56f57a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 12 Jul 2021 14:50:13 +0100 Subject: [PATCH] tcl: fix race in interp.test @@ -13,10 +13,10 @@ Signed-off-by: Ross Burton 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/interp.test b/tests/interp.test -index d742484..fc90990 100644 +index 24ffb1b..c6460ad 100644 --- a/tests/interp.test +++ b/tests/interp.test -@@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { +@@ -3614,17 +3614,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { variable result set result [lindex $args 0] } diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch index 1cd4d76283..057a08dee4 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 @@ -From b89fd73daf9b3eb2f889f65baba5f90d8a930c82 Mon Sep 17 00:00:00 2001 +From cbb5200cb2bb1d40a0535213630f689040ac7f76 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Dec 2009 23:59:44 +0000 Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/unix/Makefile.in b/unix/Makefile.in -index 7619afc..9dd053d 100644 +index bc743b3..a2f9e21 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -904,7 +904,10 @@ install-binaries: binaries +@@ -812,7 +812,10 @@ install-binaries: binaries done @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @@ -27,7 +27,7 @@ index 7619afc..9dd053d 100644 @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 0307a06..37c4d67 100644 +index 7f5464e..cd8d929 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1378,6 +1378,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 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 93e7877256..c589612963 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 @@ -From 050fc597fbfa4da2c31bd0df58c871892a490470 Mon Sep 17 00:00:00 2001 +From 574bc39a9e900870a1311148abf87830a943894c Mon Sep 17 00:00:00 2001 From: "Song.Li" Date: Wed, 1 Aug 2012 19:05:51 +0800 Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target @@ -17,10 +17,10 @@ Signed-off-by: Yi Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/configure.in b/unix/configure.in -index 4f62510..4974fb6 100644 +index e88ec3c..8e6726b 100644 --- a/unix/configure.in +++ b/unix/configure.in -@@ -775,7 +775,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}" diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb similarity index 98% rename from meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb rename to meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb index 928124148c..2f2b0c7db9 100644 --- a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb +++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb @@ -24,7 +24,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://interp.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "844775491e435e34d83d6ccfbadd1342f1855f1705253233a86152df0765e78d" +SRC_URI[sha256sum] = "3b371386a9a928eecdbf263bcab7d6a531e620ca3fbab4fdeeb3d6a9a56f38e9" SRC_URI:class-native = "${BASE_SRC_URI}"