From 06bb421e6bb9bd30352f3b1b6bd91d1eb640d927 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 25 Oct 2022 13:02:36 -0600 Subject: [PATCH] package/nodejs: bypass configure shell wrapper The configure file is a shell script which searches for a predefined python binary and then calls configure.py with that. As we already call configure with the desired python binary we should call configure.py directly so that the expected python binary is used and so that the shell wrapper doesn't throw spurious interpreter validation errors. This also avoid spurious errors due to the configure shell wrapper missing supported python versions, for example this fixes: Node.js configure: Found Python 3.11.0... Please use python3.10 or python3.9 or python3.8 or python3.7 or python3.6. /usr/bin/python3.10 ./configure Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit f073cf7547e6bef74768aee1aef67f3b28bee8c0) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 5bee082f14..06e29d0255 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -86,7 +86,7 @@ define HOST_NODEJS_CONFIGURE_CMDS $(HOST_CONFIGURE_OPTS) \ PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python3 \ - $(HOST_DIR)/bin/python3 ./configure \ + $(HOST_DIR)/bin/python3 configure.py \ --prefix=$(HOST_DIR) \ --without-dtrace \ --without-etw \ @@ -209,7 +209,7 @@ define NODEJS_CONFIGURE_CMDS LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ PYTHON=$(HOST_DIR)/bin/python3 \ - $(HOST_DIR)/bin/python3 ./configure \ + $(HOST_DIR)/bin/python3 configure.py \ --prefix=/usr \ --dest-cpu=$(NODEJS_CPU) \ $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \