[ptxdist] [PATCH] nodejs_packages: Call yarn in the right environment

[ptxdist] [PATCH] nodejs_packages: Call yarn in the right environment

[Sascha Hauer]

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

Re: [ptxdist] [APPLIED] nodejs_packages: Call yarn in the right environment

[Michael Olbrich]

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