* [ptxdist] [PATCH] nodejs_packages: Call yarn in the right environment
@ 2021-03-02 9:47 Sascha Hauer
2021-03-05 7:26 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Sascha Hauer @ 2021-03-02 9:47 UTC (permalink / raw)
To: ptxdist
Call yarn in node/env to actually cross compile native packages.
Without it the host compiler is used and installation of native packages
ends with something like:
arm-v7a-linux-gnueabihf-strip: platform/packages/nodejs_packages-0.0.1/usr/lib/node_modules/epoll/build/Release/obj.target/epoll.node: file format not recognized
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
rules/nodejs_packages.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/nodejs_packages.make b/rules/nodejs_packages.make
index e96382f62..bf533cc92 100644
--- a/rules/nodejs_packages.make
+++ b/rules/nodejs_packages.make
@@ -59,7 +59,7 @@ $(STATEDIR)/nodejs_packages.compile:
touch $(YARN_LOCK); \
ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \
fi
- yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST)
+ $(call node/env, yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST))
@find $(NODEJS_PACKAGES_CACHE) -type f -name '.yarn-tarball.tgz' -delete
@$(call touch)
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] nodejs_packages: Call yarn in the right environment
2021-03-02 9:47 [ptxdist] [PATCH] nodejs_packages: Call yarn in the right environment Sascha Hauer
@ 2021-03-05 7:26 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-03-05 7:26 UTC (permalink / raw)
To: ptxdist
Thanks, applied as 7f86f698626c990e1d5750088d68bd7f0c993e70.
Michael
[sent from post-receive hook]
On Fri, 05 Mar 2021 08:26:17 +0100, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Call yarn in node/env to actually cross compile native packages.
> Without it the host compiler is used and installation of native packages
> ends with something like:
>
> arm-v7a-linux-gnueabihf-strip: platform/packages/nodejs_packages-0.0.1/usr/lib/node_modules/epoll/build/Release/obj.target/epoll.node: file format not recognized
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Message-Id: <20210302094745.23210-1-s.hauer@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/nodejs_packages.make b/rules/nodejs_packages.make
> index e96382f625c8..bf533cc921be 100644
> --- a/rules/nodejs_packages.make
> +++ b/rules/nodejs_packages.make
> @@ -59,7 +59,7 @@ $(STATEDIR)/nodejs_packages.compile:
> touch $(YARN_LOCK); \
> ln -fs $(YARN_LOCK) $(NODEJS_PACKAGES_DIR)/yarn.lock; \
> fi
> - yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST)
> + $(call node/env, yarn $(YARN_OPTS) add $(NODEJS_PACKAGES_LIST))
> @find $(NODEJS_PACKAGES_CACHE) -type f -name '.yarn-tarball.tgz' -delete
> @$(call touch)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-05 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-02 9:47 [ptxdist] [PATCH] nodejs_packages: Call yarn in the right environment Sascha Hauer
2021-03-05 7:26 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox