From patchwork Mon Feb 20 15:46:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19832 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 ECFC4C636CC for ; Mon, 20 Feb 2023 15:46:20 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16493.1676907976976099719 for ; Mon, 20 Feb 2023 07:46:17 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5E2591FB; Mon, 20 Feb 2023 07:46:59 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0ADF43F703; Mon, 20 Feb 2023 07:46:15 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 1/8] zchunk: upgrade to 1.2.3 Date: Mon, 20 Feb 2023 15:46:07 +0000 Message-Id: <20230220154614.42832-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101168 --- .../{zchunk_1.2.0.bb => zchunk_1.2.3.bb} | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) rename meta-oe/recipes-support/zchunk/{zchunk_1.2.0.bb => zchunk_1.2.3.bb} (52%) diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb similarity index 52% rename from meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb rename to meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb index 0baea5032a..760d650de6 100644 --- a/meta-oe/recipes-support/zchunk/zchunk_1.2.0.bb +++ b/meta-oe/recipes-support/zchunk/zchunk_1.2.3.bb @@ -6,17 +6,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" -SRCREV = "dd6a30a1e4e8b738b0cafc682f3c00e7706134e5" +SRCREV = "f16dbeb0831eb37a9397356570327abb97860875" S = "${WORKDIR}/git" -DEPENDS = "\ - curl \ - zstd \ - " - +DEPENDS = "zstd" DEPENDS:append:libc-musl = " argp-standalone" -LDFLAGS:append:libc-musl = " -largp" -inherit meson pkgconfig +inherit meson pkgconfig lib_package + +PACKAGECONFIG ??= "openssl zckdl" + +# zckdl gets packaged into zchunk-bin +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl" +# Use OpenSSL primitives for SHA +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl" BBCLASSEXTEND = "native nativesdk" From patchwork Mon Feb 20 15:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19833 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 0D1C4C64ED9 for ; Mon, 20 Feb 2023 15:46:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16494.1676907977599365123 for ; Mon, 20 Feb 2023 07:46:17 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 12EADFEC; Mon, 20 Feb 2023 07:47:00 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ABBC63F703; Mon, 20 Feb 2023 07:46:16 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 2/8] python3-simpleeval: update patch status Date: Mon, 20 Feb 2023 15:46:08 +0000 Message-Id: <20230220154614.42832-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101169 --- .../recipes-devtools/python/python3-simpleeval/no-build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch b/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch index b090755f8a..8302c3b298 100644 --- a/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch +++ b/meta-python/recipes-devtools/python/python3-simpleeval/no-build.patch @@ -1,4 +1,4 @@ -Upstream-Status: Submitted [https://github.com/danthedeckie/simpleeval/pull/119] +Upstream-Status: Backport [https://github.com/danthedeckie/simpleeval/pull/119] Signed-off-by: Ross Burton From 08bc99211aec32882d5f1c83896eb5d72b9fb125 Mon Sep 17 00:00:00 2001 From patchwork Mon Feb 20 15:46:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19834 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 0D59CC677F1 for ; Mon, 20 Feb 2023 15:46:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16495.1676907978188865638 for ; Mon, 20 Feb 2023 07:46:18 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B542F1FB; Mon, 20 Feb 2023 07:47:00 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 615AE3F703; Mon, 20 Feb 2023 07:46:17 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 3/8] nodejs: remove redundant expand=True to getVar() Date: Mon, 20 Feb 2023 15:46:09 +0000 Message-Id: <20230220154614.42832-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101170 The expand argument defaults to True, so there's no need to specify it. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index 02f1ac5d4a..6431069e9c 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -93,17 +93,17 @@ python do_unpack() { import shutil bb.build.exec_func('base_do_unpack', d) - shutil.rmtree(d.getVar('S') + '/deps/openssl', True) + shutil.rmtree(d.getVar('S') + '/deps/openssl') if 'ares' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/cares', True) + shutil.rmtree(d.getVar('S') + '/deps/cares') if 'brotli' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/brotli', True) + shutil.rmtree(d.getVar('S') + '/deps/brotli') if 'libuv' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/uv', True) + shutil.rmtree(d.getVar('S') + '/deps/uv') if 'nghttp2' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) + shutil.rmtree(d.getVar('S') + '/deps/nghttp2') if 'zlib' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/zlib', True) + shutil.rmtree(d.getVar('S') + '/deps/zlib') } # V8's JIT infrastructure requires binaries such as mksnapshot and From patchwork Mon Feb 20 15:46:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19831 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 E7694C05027 for ; Mon, 20 Feb 2023 15:46:20 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16496.1676907978830751659 for ; Mon, 20 Feb 2023 07:46:18 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 61D03FEC; Mon, 20 Feb 2023 07:47:01 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0FE9A3F703; Mon, 20 Feb 2023 07:46:17 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 4/8] nodejs: run configure.py in verbose mode Date: Mon, 20 Feb 2023 15:46:10 +0000 Message-Id: <20230220154614.42832-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101171 It's useful to know what configure is detecting, so pass --verbose. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index 6431069e9c..e14f1a4d7f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -142,7 +142,7 @@ do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --cross-compiling \ + python3 configure.py --verbose --prefix=${prefix} --cross-compiling \ --shared-openssl \ --without-dtrace \ --without-etw \ From patchwork Mon Feb 20 15:46:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19836 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 EED75C64EC4 for ; Mon, 20 Feb 2023 15:46:20 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16498.1676907979465317956 for ; Mon, 20 Feb 2023 07:46:19 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0E4D01FB; Mon, 20 Feb 2023 07:47:02 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B08243F703; Mon, 20 Feb 2023 07:46:18 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 5/8] nodejs: use a postfunc to prune source tree Date: Mon, 20 Feb 2023 15:46:11 +0000 Message-Id: <20230220154614.42832-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101172 Instead of overriding do_unpack entirely and calling into base_do_unpack, use a postfunc. This keeps the prune logic separated neatly. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index e14f1a4d7f..180e170a35 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -89,10 +89,9 @@ EXTRA_OEMAKE = "\ builddir_name=./ \ " -python do_unpack() { +python prune_sources() { import shutil - bb.build.exec_func('base_do_unpack', d) shutil.rmtree(d.getVar('S') + '/deps/openssl') if 'ares' in d.getVar('PACKAGECONFIG'): shutil.rmtree(d.getVar('S') + '/deps/cares') @@ -105,6 +104,7 @@ python do_unpack() { if 'zlib' in d.getVar('PACKAGECONFIG'): shutil.rmtree(d.getVar('S') + '/deps/zlib') } +do_unpack[postfuncs] += "prune_sources" # V8's JIT infrastructure requires binaries such as mksnapshot and # mkpeephole to be run in the host during the build. However, these From patchwork Mon Feb 20 15:46:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19835 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 02944C64EC7 for ; Mon, 20 Feb 2023 15:46:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16267.1676907980122426321 for ; Mon, 20 Feb 2023 07:46:20 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AF007FEC; Mon, 20 Feb 2023 07:47:02 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5D0C43F703; Mon, 20 Feb 2023 07:46:19 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 6/8] nodejs: don't force cross-compilation in native builds Date: Mon, 20 Feb 2023 15:46:12 +0000 Message-Id: <20230220154614.42832-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101173 By not forcing the cross-compile build logic in native builds the build is a _lot_ faster. Walltime in buildstats-diff on my machine: nodejs-native do_compile -475.6s -41.2% 1153.4s -> 677.7s Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index 180e170a35..2c6db481c6 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -137,18 +137,22 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile LDFLAGS:append:x86 = " -latomic" +CROSS_FLAGS = "--cross-compiling" +CROSS_FLAGS:class-native = "--no-cross-compiling" + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --verbose --prefix=${prefix} --cross-compiling \ + python3 configure.py --verbose --prefix=${prefix} \ --shared-openssl \ --without-dtrace \ --without-etw \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ --libdir=${libdir} \ + ${CROSS_FLAGS} \ ${ARCHFLAGS} \ ${PACKAGECONFIG_CONFARGS} } From patchwork Mon Feb 20 15:46:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19838 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 CC8E1C636CC for ; Mon, 20 Feb 2023 15:46:30 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16499.1676907980796319169 for ; Mon, 20 Feb 2023 07:46:20 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5BB2615BF; Mon, 20 Feb 2023 07:47:03 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 09A1A3F703; Mon, 20 Feb 2023 07:46:19 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 7/8] nodejs: remove LD assignment Date: Mon, 20 Feb 2023 15:46:13 +0000 Message-Id: <20230220154614.42832-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101174 The purpose of this appears to have been lost, and the build succeeds without it. If it is needed, then it should be added to EXTRA_OEMAKE alongside the CC and CXX assignments. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index 2c6db481c6..c95a72fa94 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -140,9 +140,10 @@ LDFLAGS:append:x86 = " -latomic" CROSS_FLAGS = "--cross-compiling" CROSS_FLAGS:class-native = "--no-cross-compiling" +#export LD="${CXX}" + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { - export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings python3 configure.py --verbose --prefix=${prefix} \ @@ -158,7 +159,6 @@ do_configure () { } do_compile () { - export LD="${CXX}" install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh oe_runmake BUILDTYPE=Release From patchwork Mon Feb 20 15:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 19837 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 D2AADC636D6 for ; Mon, 20 Feb 2023 15:46:30 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16268.1676907981452799307 for ; Mon, 20 Feb 2023 07:46:21 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0889B1FB; Mon, 20 Feb 2023 07:47:04 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AA6D23F703; Mon, 20 Feb 2023 07:46:20 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 8/8] nodejs: no need to stage binaries for target Date: Mon, 20 Feb 2023 15:46:14 +0000 Message-Id: <20230220154614.42832-8-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220154614.42832-1-ross.burton@arm.com> References: <20230220154614.42832-1-ross.burton@arm.com> MIME-Version: 1.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 ; Mon, 20 Feb 2023 15:46:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101175 Target nodejs doesn't depend on nodejs-native to build anymore, so there is no need to stage these binaries. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb index c95a72fa94..0346f54e6f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb @@ -174,19 +174,6 @@ do_install_ptest () { chown -R root:root ${D}${PTEST_PATH} } -BINARIES = " \ - bytecode_builtins_list_generator \ - ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-case', '', d)} \ - node_mksnapshot \ - torque \ -" - -do_install:append:class-native() { - # Install the native binaries to provide it within sysroot for the target compilation - install -d ${D}${bindir} - (cd ${S}/out/Release && install ${BINARIES} ${D}${bindir}) -} - PACKAGES =+ "${PN}-npm" FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx" RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \