From patchwork Thu Nov 14 13:23:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 52476 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 25257D68B10 for ; Thu, 14 Nov 2024 13:23:39 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.37033.1731590612432308163 for ; Thu, 14 Nov 2024 05:23:32 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AE8HWEU029855 for ; Thu, 14 Nov 2024 05:23:32 -0800 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwppbtr1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 05:23:31 -0800 (PST) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:31 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:29 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 1/7] nodejs: Upgrade to 20.13.0 release Date: Thu, 14 Nov 2024 13:23:22 +0000 Message-ID: <20241114132328.1340824-1-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: fE-T5hnn2sNKS2o-L2KuQ1AhFnWpB1eD X-Proofpoint-GUID: fE-T5hnn2sNKS2o-L2KuQ1AhFnWpB1eD X-Authority-Analysis: v=2.4 cv=J4f47xnS c=1 sm=1 tr=0 ts=6735f9d3 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=pGLkceISAAAA:8 a=-LCu6K_DAAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=19RDG04orJZLT5jqiVEA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 bulkscore=0 clxscore=1015 mlxscore=0 suspectscore=0 malwarescore=0 mlxlogscore=968 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113816 From: Khem Raj nodejs release notes [1] License-Update: Copyright year changed for Unicode License [2] [1] https://nodejs.org/en/blog/release/v20.13.0 [2] https://github.com/nodejs/node/commit/d5a316f5ea3fade3140c2ae35c144b500fb5d758 Signed-off-by: Khem Raj Signed-off-by: Archana Polampalli --- .../oe-npm-cache | 0 ...-cache-native_20.12.bb => nodejs-oe-cache-native_20.13.bb} | 0 .../nodejs/{nodejs_20.12.2.bb => nodejs_20.13.0.bb} | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-20.12 => nodejs-oe-cache-20.13}/oe-npm-cache (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-native_20.12.bb => nodejs-oe-cache-native_20.13.bb} (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs_20.12.2.bb => nodejs_20.13.0.bb} (97%) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb similarity index 97% rename from meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb rename to meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb index d86c38f2f..25b59495e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9a7fcce64128730251dbc58aa41b4674" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7" CVE_PRODUCT = "nodejs node.js" @@ -36,7 +36,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7" +SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7" S = "${WORKDIR}/node-v${PV}" From patchwork Thu Nov 14 13:23:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 52475 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 22F5ED68B0F for ; Thu, 14 Nov 2024 13:23:39 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.36688.1731590615097374595 for ; Thu, 14 Nov 2024 05:23:35 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AEAxmrM029301 for ; Thu, 14 Nov 2024 13:23:34 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwv4bt9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 13:23:34 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:33 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:31 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 2/7] nodejs: upgrade 20.13.0 -> 20.16.0 Date: Thu, 14 Nov 2024 13:23:23 +0000 Message-ID: <20241114132328.1340824-2-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20241114132328.1340824-1-archana.polampalli@windriver.com> References: <20241114132328.1340824-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: 3BY1mYnOa89Tl36z7GS9aIk8FZJm-0aO X-Authority-Analysis: v=2.4 cv=Ke6AshYD c=1 sm=1 tr=0 ts=6735f9d6 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=pGLkceISAAAA:8 a=t7CeM3EgAAAA:8 a=fZqHTnp-7S5Dpky0ff8A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: 3BY1mYnOa89Tl36z7GS9aIk8FZJm-0aO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 mlxlogscore=749 priorityscore=1501 lowpriorityscore=0 suspectscore=0 mlxscore=0 impostorscore=0 clxscore=1015 adultscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113817 From: Jason Schonberg Signed-off-by: Jason Schonberg Signed-off-by: Khem Raj Signed-off-by: Archana Polampalli --- .../oe-npm-cache | 0 ...oe-cache-native_20.13.bb => nodejs-oe-cache-native_20.16.bb} | 0 .../nodejs/{nodejs_20.13.0.bb => nodejs_20.16.0.bb} | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-20.13 => nodejs-oe-cache-20.16}/oe-npm-cache (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-native_20.13.bb => nodejs-oe-cache-native_20.16.bb} (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs_20.13.0.bb => nodejs_20.16.0.bb} (98%) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.16/oe-npm-cache similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.16/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.16.bb similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.16.bb diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.16.0.bb similarity index 98% rename from meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb rename to meta-oe/recipes-devtools/nodejs/nodejs_20.16.0.bb index 25b59495e..3517fe6dc 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.16.0.bb @@ -36,7 +36,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7" +SRC_URI[sha256sum] = "cd6c8fc3ff2606aadbc7155db6f7e77247d2d0065ac18e2f7f049095584b8b46" S = "${WORKDIR}/node-v${PV}" From patchwork Thu Nov 14 13:23:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 52477 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 2841BD68B09 for ; Thu, 14 Nov 2024 13:23:39 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.37034.1731590616098780480 for ; Thu, 14 Nov 2024 05:23:36 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AE5nEL3007838 for ; Thu, 14 Nov 2024 05:23:36 -0800 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwppbtr7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 05:23:35 -0800 (PST) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:34 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:33 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 3/7] nodejs: support cross compile without qemu user conditionally Date: Thu, 14 Nov 2024 13:23:24 +0000 Message-ID: <20241114132328.1340824-3-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20241114132328.1340824-1-archana.polampalli@windriver.com> References: <20241114132328.1340824-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: D2Zs6MZWNY-MkKJDSlcNw2InVH9ninlb X-Proofpoint-GUID: D2Zs6MZWNY-MkKJDSlcNw2InVH9ninlb X-Authority-Analysis: v=2.4 cv=J4f47xnS c=1 sm=1 tr=0 ts=6735f9d7 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=t7CeM3EgAAAA:8 a=NEAV23lmAAAA:8 a=pGLkceISAAAA:8 a=-LCu6K_DAAAA:8 a=iBOFqOu9Pd5gn2CWdD4A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 bulkscore=0 clxscore=1015 mlxscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113818 From: Hongxu Jia Due to the scope of supported BSPs by qemu-user is limited, such as a segment fault on armv9 after qemu apply commit [target/arm: Convert LDAPR/STLR (imm) to decodetree][1] ``` |tmp-glibc/work/neoversen2-crypto-wrs-linux/nodejs/20.5.1/node-v20.5.1/out/ Release/v8-qemu-wrapper.sh: line 7: 3179613 Segmentation fault (core dumped) PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 -L tmp-glibc/work/neoversen2-crypto-wrs-linux/ nodejs/20.5.1/recipe-sysroot -E LD_LIBRARY_PATH=tmp-glibc/work/neoversen2-crypto-wrs-linux/ nodejs/20.5.1/recipe-sysroot/usr/lib64:tmp-glibc/work/neoversen2-crypto-wrs-linux/ nodejs/20.5.1/recipe-sysroot/usr/lib64 "$@" ``` Upstream nodejs have cross compile support, but it needs host and target have same bit width (e.g. a x86_64 host targeting arrch64 to produce a 64-bit binary). So: 1. If host and target have different bit width, build with QEMU user as usual; 2. If host and target have same bit width, enable notejs cross compile support: - The build tools of nodejs is GYP[2], set CC_host, CFLAGS_host, CXX_host, CXXFLAGS_host, LDFLAGS_host, AR_host for host build which is separated with target build [3] - Satisfy layer compatibility, set GYP variables in prefuncs of do_configure, do_compile and do_install other than in recipe parsing - Add missing native packages to fix library missing on host build - Rework libatomic.patch, explicitly link to libatomic for clang conditionally [1] https://github.com/qemu/qemu/commit/2521b6073b7b4b505533a941d4f9600f7585dc78 [2] https://github.com/nodejs/node-gyp [3] https://github.com/nodejs/node-gyp/blob/main/gyp/docs/UserDocumentation.md#cross-compiling Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj Signed-off-by: Archana Polampalli --- .../nodejs/nodejs/libatomic.patch | 85 +++++++++++++++---- .../recipes-devtools/nodejs/nodejs_20.16.0.bb | 80 +++++++++++------ 2 files changed, 124 insertions(+), 41 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch index cb0237309..6b7ccb8a9 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch @@ -1,21 +1,76 @@ -Link mksnapshot with libatomic on x86 +From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Sat, 17 Aug 2024 21:33:18 +0800 +Subject: [PATCH] link libatomic for clang conditionally -Clang-12 on x86 emits atomic builtins +Clang emits atomic builtin, explicitly link libatomic conditionally: +- For target build, always link -latomic for clang as usual +- For host build, if host and target have same bit width, cross compiling + is enabled, and host toolchain is gcc which does not link -latomic; + if host and target have different bit width, no cross compiling, + host build is the same with target build that requires to link + -latomic; -Fixes -| module-compiler.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x558): un -defined reference to `__atomic_load' +Fix: +|tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory -Upstream-Status: Pending -Signed-off-by: Khem Raj +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Hongxu Jia +--- + node.gyp | 13 ++++++++++++- + tools/v8_gypfiles/v8.gyp | 15 ++++++++++++--- + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/node.gyp b/node.gyp +index b425f443..f296f35c 100644 +--- a/node.gyp ++++ b/node.gyp +@@ -487,7 +487,18 @@ + ], + }], + ['OS == "linux" and llvm_version != "0.0"', { +- 'libraries': ['-latomic'], ++ 'target_conditions': [ ++ ['_toolset=="host"', { ++ 'conditions': [ ++ ['" X-Patchwork-Id: 52478 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 044F1D68B11 for ; Thu, 14 Nov 2024 13:23:49 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.37036.1731590618938421770 for ; Thu, 14 Nov 2024 05:23:39 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AE6E0Uc002314 for ; Thu, 14 Nov 2024 13:23:38 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwv4bt9p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 13:23:37 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:36 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:35 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 4/7] nodejs: upgrade 20.16.0 -> 20.17.0 Date: Thu, 14 Nov 2024 13:23:25 +0000 Message-ID: <20241114132328.1340824-4-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20241114132328.1340824-1-archana.polampalli@windriver.com> References: <20241114132328.1340824-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: KQGBQGwrhEiYB-NYHV_otmlDtdsAVxPo X-Authority-Analysis: v=2.4 cv=Ke6AshYD c=1 sm=1 tr=0 ts=6735f9d9 cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=pGLkceISAAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=-LCu6K_DAAAA:8 a=FmfWfhjdfKe8JZWfUtQA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: KQGBQGwrhEiYB-NYHV_otmlDtdsAVxPo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 suspectscore=0 mlxscore=0 impostorscore=0 clxscore=1015 adultscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113819 From: "J. S" commit c1ddc60fd25456da07d8402c89157c4354fde5ac Author: Jason Schonberg Date: Wed Aug 21 17:40:03 2024 -0400 License change - remove highlight.js https://github.com/nodejs/node/commit/1c5fe040a0a73b483cc3e3fef76efe2d1712205b Changelog : https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.17.0 nodejs: upgrade 20.16.0 -> 20.17.0 Signed-off-by: Jason Schonberg Signed-off-by: Khem Raj Signed-off-by: Archana Polampalli --- .../oe-npm-cache | 0 ...-cache-native_20.16.bb => nodejs-oe-cache-native_20.17.bb} | 0 .../nodejs/{nodejs_20.16.0.bb => nodejs_20.17.0.bb} | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-20.16 => nodejs-oe-cache-20.17}/oe-npm-cache (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-native_20.16.bb => nodejs-oe-cache-native_20.17.bb} (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs_20.16.0.bb => nodejs_20.17.0.bb} (97%) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.16/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.16/oe-npm-cache rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.16.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.16.bb rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.16.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb similarity index 97% rename from meta-oe/recipes-devtools/nodejs/nodejs_20.16.0.bb rename to meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb index 55a984331..0c0791516 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.16.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ab85b3bae451276a10919163bcc5b74" CVE_PRODUCT = "nodejs node.js" @@ -33,7 +33,7 @@ SRC_URI:append:class-target = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "cd6c8fc3ff2606aadbc7155db6f7e77247d2d0065ac18e2f7f049095584b8b46" +SRC_URI[sha256sum] = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c" S = "${WORKDIR}/node-v${PV}" From patchwork Thu Nov 14 13:23:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 52479 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 05606D68B12 for ; Thu, 14 Nov 2024 13:23:49 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.37037.1731590619866950409 for ; Thu, 14 Nov 2024 05:23:39 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AEBSk0H016838 for ; Thu, 14 Nov 2024 05:23:39 -0800 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwppbtrg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 05:23:39 -0800 (PST) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:38 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:37 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 5/7] nodejs: Fix build with libc++ 19 Date: Thu, 14 Nov 2024 13:23:26 +0000 Message-ID: <20241114132328.1340824-5-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20241114132328.1340824-1-archana.polampalli@windriver.com> References: <20241114132328.1340824-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 6-hCqtBnY2gGgVFv7gserYF1-nItnLmF X-Proofpoint-GUID: 6-hCqtBnY2gGgVFv7gserYF1-nItnLmF X-Authority-Analysis: v=2.4 cv=J4f47xnS c=1 sm=1 tr=0 ts=6735f9db cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=pGLkceISAAAA:8 a=Twlkf-z8AAAA:8 a=Oh2cFVv5AAAA:8 a=t7CeM3EgAAAA:8 a=cm27Pg_UAAAA:8 a=-LCu6K_DAAAA:8 a=z4qFTBnbxKX3v4yr1lEA:9 a=W-gb19_dOTsA:10 a=-74SuR6ZdpOK_LpdRCUo:22 a=7KeoIwV6GZqOttXkcoxL:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 bulkscore=0 clxscore=1015 mlxscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113820 From: Khem Raj As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes nodejs-20 to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ ../deps/v8/src/inspector/string-16.h:114:28: note: in instantiation of template class 'std::basic_string' requested here 114 | std::basic_string m_impl; | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Upstream v8 has fixed this in commit 182d9c05e78 [2], so add it as a backported patch, until the next version of node is released. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://chromium.googlesource.com/v8/v8.git/+/182d9c05e78 Signed-off-by: Khem Raj Signed-off-by: Archana Polampalli --- .../nodejs/nodejs/182d9c05e78.patch | 182 ++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_20.17.0.bb | 1 + 2 files changed, 183 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch b/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch new file mode 100644 index 000000000..9b3fc566c --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch @@ -0,0 +1,182 @@ +From 182d9c05e78b1ddb1cb8242cd3628a7855a0336f Mon Sep 17 00:00:00 2001 +From: Andrey Kosyakov +Date: Thu, 17 Aug 2023 13:50:11 -0700 +Subject: [PATCH] Define UChar as char16_t + +We used to have UChar defined as uint16_t which does not go along +with STL these days if you try to have an std::basic_string<> of it, +as there are no standard std::char_traits<> specialization for uint16_t. + +This switches UChar to char16_t where practical, introducing a few +compatibility shims to keep CL size small, as (1) this would likely +have to be back-ported and (2) crdtp extensively uses uint16_t for +wide chars. + +Bug: b:296390693 +Change-Id: I66a32d8f0050915225b187de56896c26dd76163d +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4789966 +Reviewed-by: Jaroslav Sevcik +Commit-Queue: Jaroslav Sevcik +Auto-Submit: Andrey Kosyakov +Cr-Commit-Position: refs/heads/main@{#89559} + +Upstream-Status: Backport [https://chromium-review.googlesource.com/c/v8/v8/+/4789966] +Signed-off-by: Khem Raj +--- + src/inspector/string-16.cc | 8 +++++++- + src/inspector/string-16.h | 10 ++++++++-- + src/inspector/v8-string-conversions.cc | 6 +++--- + src/inspector/v8-string-conversions.h | 6 ++++-- + .../inspector_protocol/crdtp/test_platform_v8.cc | 9 ++++++--- + 5 files changed, 28 insertions(+), 11 deletions(-) + +--- a/deps/v8/src/inspector/string-16.cc ++++ b/deps/v8/src/inspector/string-16.cc +@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) { + return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); + } + +-int64_t charactersToInteger(const UChar* characters, size_t length, ++int64_t charactersToInteger(const uint16_t* characters, size_t length, + bool* ok = nullptr) { + std::vector buffer; + buffer.reserve(length + 1); +@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* + + String16::String16(const UChar* characters, size_t size) + : m_impl(characters, size) {} ++String16::String16(const uint16_t* characters, size_t size) ++ : m_impl(reinterpret_cast(characters), size) {} + + String16::String16(const UChar* characters) : m_impl(characters) {} + +@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UCh + #endif // V8_TARGET_BIG_ENDIAN + } + ++String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { ++ return fromUTF16LE(reinterpret_cast(stringStart), length); ++} ++ + std::string String16::utf8() const { + return UTF16ToUTF8(m_impl.data(), m_impl.size()); + } +--- a/deps/v8/src/inspector/string-16.h ++++ b/deps/v8/src/inspector/string-16.h +@@ -6,6 +6,7 @@ + #define V8_INSPECTOR_STRING_16_H_ + + #include ++#include + + #include + #include +@@ -17,7 +18,7 @@ + + namespace v8_inspector { + +-using UChar = uint16_t; ++using UChar = char16_t; + + class String16 { + public: +@@ -27,6 +28,7 @@ class String16 { + String16(const String16&) V8_NOEXCEPT = default; + String16(String16&&) V8_NOEXCEPT = default; + String16(const UChar* characters, size_t size); ++ String16(const uint16_t* characters, size_t size); + V8_EXPORT String16(const UChar* characters); + V8_EXPORT String16(const char* characters); + String16(const char* characters, size_t size); +@@ -48,7 +50,9 @@ class String16 { + int toInteger(bool* ok = nullptr) const; + std::pair getTrimmedOffsetAndLength() const; + String16 stripWhiteSpace() const; +- const UChar* characters16() const { return m_impl.c_str(); } ++ const uint16_t* characters16() const { ++ return reinterpret_cast(m_impl.c_str()); ++ } + size_t length() const { return m_impl.length(); } + bool isEmpty() const { return !m_impl.length(); } + UChar operator[](size_t index) const { return m_impl[index]; } +@@ -78,6 +82,8 @@ class String16 { + // On Big endian architectures, byte order needs to be flipped. + V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart, + size_t length); ++ V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart, ++ size_t length); + + std::size_t hash() const { + if (!hash_code) { +--- a/deps/v8/src/inspector/v8-string-conversions.cc ++++ b/deps/v8/src/inspector/v8-string-conversions.cc +@@ -12,7 +12,7 @@ + + namespace v8_inspector { + namespace { +-using UChar = uint16_t; ++using UChar = char16_t; + using UChar32 = uint32_t; + + bool isASCII(UChar c) { return !(c & ~0x7F); } +@@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* str + + std::basic_string UTF8ToUTF16(const char* stringStart, size_t length) { + if (!stringStart || !length) return std::basic_string(); +- std::vector buffer(length); ++ std::vector buffer(length); + UChar* bufferStart = buffer.data(); + + UChar* bufferCurrent = bufferStart; +@@ -395,7 +395,7 @@ std::basic_string UTF8ToUTF16(con + reinterpret_cast(stringStart + length), + &bufferCurrent, bufferCurrent + buffer.size(), nullptr, + true) != conversionOK) +- return std::basic_string(); ++ return std::basic_string(); + size_t utf16Length = bufferCurrent - bufferStart; + return std::basic_string(bufferStart, bufferStart + utf16Length); + } +--- a/deps/v8/src/inspector/v8-string-conversions.h ++++ b/deps/v8/src/inspector/v8-string-conversions.h +@@ -5,14 +5,16 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include ++ + #include + #include + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may + // want to use string-16.h directly rather than these. + namespace v8_inspector { +-std::basic_string UTF8ToUTF16(const char* stringStart, size_t length); +-std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length); ++std::basic_string UTF8ToUTF16(const char* stringStart, size_t length); ++std::string UTF16ToUTF8(const char16_t* stringStart, size_t length); + } // namespace v8_inspector + + #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ +--- a/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc ++++ b/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc +@@ -11,13 +11,16 @@ + namespace v8_crdtp { + + std::string UTF16ToUTF8(span in) { +- return v8_inspector::UTF16ToUTF8(in.data(), in.size()); ++ return v8_inspector::UTF16ToUTF8(reinterpret_cast(in.data()), ++ in.size()); + } + + std::vector UTF8ToUTF16(span in) { +- std::basic_string utf16 = v8_inspector::UTF8ToUTF16( ++ std::basic_string utf16 = v8_inspector::UTF8ToUTF16( + reinterpret_cast(in.data()), in.size()); +- return std::vector(utf16.begin(), utf16.end()); ++ return std::vector( ++ reinterpret_cast(utf16.data()), ++ reinterpret_cast(utf16.data()) + utf16.size()); + } + + } // namespace v8_crdtp diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb index 0c0791516..be1802f29 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb @@ -25,6 +25,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ file://libatomic.patch \ + file://182d9c05e78.patch \ file://run-ptest \ " SRC_URI:append:class-target = " \ From patchwork Thu Nov 14 13:23:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 52481 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 0BDC6D68B14 for ; Thu, 14 Nov 2024 13:23:49 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.37040.1731590622539071923 for ; Thu, 14 Nov 2024 05:23:42 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AE7XCol008402 for ; Thu, 14 Nov 2024 13:23:41 GMT Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwtubstn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 13:23:41 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:40 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:39 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 6/7] nodejs: upgrade 20.17.0 -> 20.18.0 Date: Thu, 14 Nov 2024 13:23:27 +0000 Message-ID: <20241114132328.1340824-6-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20241114132328.1340824-1-archana.polampalli@windriver.com> References: <20241114132328.1340824-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: asxGr3VikTD6SoSeLLCvWSMhgE66jf-K X-Authority-Analysis: v=2.4 cv=BPnhr0QG c=1 sm=1 tr=0 ts=6735f9dd cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=pGLkceISAAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=-LCu6K_DAAAA:8 a=wmoFfhs-WseHezOzP3oA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: asxGr3VikTD6SoSeLLCvWSMhgE66jf-K X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 bulkscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113821 From: "J. S" License checksum change due to whitespace changes. https://github.com/nodejs/node/commit/1dfd238781 libatomic.patch change due to changes in node.gyp https://github.com/nodejs/node/commit/25c788009f1fa7a392af51cb97d0a55f0f4a6983 Changelog : https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.18.0 Signed-off-by: Jason Schonberg Signed-off-by: Khem Raj Signed-off-by: Archana Polampalli --- .../oe-npm-cache | 0 ...-cache-native_20.17.bb => nodejs-oe-cache-native_20.18.bb} | 0 meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch | 2 +- .../nodejs/{nodejs_20.17.0.bb => nodejs_20.18.0.bb} | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-20.17 => nodejs-oe-cache-20.18}/oe-npm-cache (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs-oe-cache-native_20.17.bb => nodejs-oe-cache-native_20.18.bb} (100%) rename meta-oe/recipes-devtools/nodejs/{nodejs_20.17.0.bb => nodejs_20.18.0.bb} (98%) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.18/oe-npm-cache similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.18/oe-npm-cache diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.18.bb similarity index 100% rename from meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb rename to meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.18.bb diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch index 6b7ccb8a9..22dc6c151 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch @@ -29,7 +29,7 @@ index b425f443..f296f35c 100644 @@ -487,7 +487,18 @@ ], }], - ['OS == "linux" and llvm_version != "0.0"', { + ['OS=="linux" and clang==1', { - 'libraries': ['-latomic'], + 'target_conditions': [ + ['_toolset=="host"', { diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.18.0.bb similarity index 98% rename from meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb rename to meta-oe/recipes-devtools/nodejs/nodejs_20.18.0.bb index be1802f29..f937e298e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.18.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ab85b3bae451276a10919163bcc5b74" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c83fcdcd43ab352be6429ee1fd8827a0" CVE_PRODUCT = "nodejs node.js" @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c" +SRC_URI[sha256sum] = "7d9433e91fd88d82ba8de86e711ec41907638e227993d22e95126b02f6cd714a" S = "${WORKDIR}/node-v${PV}" From patchwork Thu Nov 14 13:23:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Polampalli, Archana" X-Patchwork-Id: 52480 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 14C89D68B16 for ; Thu, 14 Nov 2024 13:23:49 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.37041.1731590623376453948 for ; Thu, 14 Nov 2024 05:23:43 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=10487a133e=archana.polampalli@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AE8HtCP030802 for ; Thu, 14 Nov 2024 05:23:43 -0800 Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 42uwpmktfy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 14 Nov 2024 05:23:42 -0800 (PST) Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Thu, 14 Nov 2024 05:23:42 -0800 Received: from blr-linux-engg1.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Thu, 14 Nov 2024 05:23:40 -0800 From: To: Subject: [oe][meta-oe][scarthgap][PATCH 7/7] nodejs: cleanup Date: Thu, 14 Nov 2024 13:23:28 +0000 Message-ID: <20241114132328.1340824-7-archana.polampalli@windriver.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20241114132328.1340824-1-archana.polampalli@windriver.com> References: <20241114132328.1340824-1-archana.polampalli@windriver.com> MIME-Version: 1.0 X-Proofpoint-GUID: 8-ROiKFjv_WAyx6haYn4G5sN9C-2Y5Ln X-Authority-Analysis: v=2.4 cv=ZdlPNdVA c=1 sm=1 tr=0 ts=6735f9de cx=c_pps a=K4BcnWQioVPsTJd46EJO2w==:117 a=K4BcnWQioVPsTJd46EJO2w==:17 a=VlfZXiiP6vEA:10 a=pGLkceISAAAA:8 a=NEAV23lmAAAA:8 a=20KFwNOVAAAA:8 a=Y1CTIuGaO5iKeU1sxbUA:9 X-Proofpoint-ORIG-GUID: 8-ROiKFjv_WAyx6haYn4G5sN9C-2Y5Ln X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 mlxscore=0 priorityscore=1501 spamscore=0 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2409260000 definitions=main-2411140105 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 ; Thu, 14 Nov 2024 13:23:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113822 From: "J. S" Drop two patches which haven't been referenced by the nodejs recipe since the 20.11.0 version checkin. 0001-build-fix-build-with-Python-3.12.patch 0001-gyp-resolve-python-3.12-issues.patch Signed-off-by: Jason Schonberg Signed-off-by: Khem Raj --- ...001-build-fix-build-with-Python-3.12.patch | 55 ---------------- .../0001-gyp-resolve-python-3.12-issues.patch | 63 ------------------- 2 files changed, 118 deletions(-) delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch deleted file mode 100644 index 39026d074..000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001 -From: Luigi Pinca -Date: Wed, 8 Nov 2023 21:20:53 +0100 -Subject: [PATCH] build: fix build with Python 3.12 - -Replace `distutils.version.StrictVersion` with -`packaging.version.Version`. - -Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539 -PR-URL: https://github.com/nodejs/node/pull/50582 -Reviewed-By: Richard Lau -Reviewed-By: Chengzhong Wu - -Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6] -Signed-off-by: Alexander Kanavin ---- - configure.py | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/configure.py b/configure.py -index 62f041ce..18fe7c14 100755 ---- a/configure.py -+++ b/configure.py -@@ -14,8 +14,6 @@ import bz2 - import io - from pathlib import Path - --from distutils.version import StrictVersion -- - # If not run from node/, cd to node/. - os.chdir(Path(__file__).parent) - -@@ -30,6 +28,7 @@ tools_path = Path('tools') - - sys.path.insert(0, str(tools_path / 'gyp' / 'pylib')) - from gyp.common import GetFlavor -+from packaging.version import Version - - # imports in tools/configure.d - sys.path.insert(0, str(tools_path / 'configure.d')) -@@ -1565,10 +1564,10 @@ def configure_openssl(o): - # supported asm compiler for AVX2. See https://github.com/openssl/openssl/ - # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69 - openssl110_asm_supported = \ -- ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \ -- ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \ -- ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \ -- ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10')) -+ ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \ -+ ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \ -+ ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \ -+ ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10')) - - if is_x86 and not openssl110_asm_supported: - error('''Did not find a new enough assembler, install one or build with diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch deleted file mode 100644 index 9d878dfb8..000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 7 Dec 2023 12:54:30 +0100 -Subject: [PATCH] gyp: resolve python 3.12 issues - -Upstream has updated gyp wholesale in the main branch, so -this patch can be dropped in due time. - -Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update] - -Signed-off-by: Alexander Kanavin ---- - deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++-- - tools/gyp/pylib/gyp/input.py | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py -index d9699a0a..173e9465 100644 ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py -@@ -16,7 +16,7 @@ import subprocess - import sys - import threading - import traceback --from distutils.version import StrictVersion -+from packaging.version import Version - from gyp.common import GypError - from gyp.common import OrderedSet - -@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil - else: - ast_code = compile(cond_expr_expanded, "", "eval") - cached_conditions_asts[cond_expr_expanded] = ast_code -- env = {"__builtins__": {}, "v": StrictVersion} -+ env = {"__builtins__": {}, "v": Version} - if eval(ast_code, env, variables): - return true_dict - return false_dict -diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py -index 354958bf..ab6112e5 100644 ---- a/tools/gyp/pylib/gyp/input.py -+++ b/tools/gyp/pylib/gyp/input.py -@@ -16,7 +16,7 @@ import subprocess - import sys - import threading - import traceback --from distutils.version import StrictVersion -+from packaging.version import Version - from gyp.common import GypError - from gyp.common import OrderedSet - -@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil - else: - ast_code = compile(cond_expr_expanded, "", "eval") - cached_conditions_asts[cond_expr_expanded] = ast_code -- env = {"__builtins__": {}, "v": StrictVersion} -+ env = {"__builtins__": {}, "v": Version} - if eval(ast_code, env, variables): - return true_dict - return false_dict --- -2.39.2 -