From 726209fc7999986fa414d629ff60d1bc76c63a2c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 8 Jan 2022 11:15:19 +0100 Subject: [PATCH] package/scons: bring back Python interpreter call in SCONS variable Back in commit f72be49830404fb69480a9e5db4381dfcc6dc8ec ("package/scons: remove python from SCONS"), we changed the SCONS variable to not explicitly invoke the Python interpreter, because some scons-based packages used python2, some python3. Now that the 3 remaining packages using scons (gpsd, mongodb and benejson) all use python3, we can bring back the python3 interpreter call into the SCONS variable, and slightly simplify those packages. Signed-off-by: Thomas Petazzoni --- package/benejson/benejson.mk | 2 +- package/gpsd/gpsd.mk | 6 +++--- package/mongodb/mongodb.mk | 4 ++-- package/scons/scons.mk | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index 5bb57d028d..f6f936ec71 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -41,7 +41,7 @@ endif # Shared enabled define BENEJSON_BUILD_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - $(HOST_DIR)/bin/python3 $(SCONS) $(BENEJSON_SCONS_TARGETS)) + $(SCONS) $(BENEJSON_SCONS_TARGETS)) endef define BENEJSON_INSTALL_STAGING_CMDS diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index ff924c49e0..61391f0e9b 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -211,7 +211,7 @@ GPSD_SCONS_ENV += \ define GPSD_BUILD_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS)) endef @@ -219,7 +219,7 @@ define GPSD_INSTALL_TARGET_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(TARGET_DIR) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS) \ $(if $(BR2_PACKAGE_HAS_UDEV),udev-install,install)) endef @@ -241,7 +241,7 @@ define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(STAGING_DIR) \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) endef diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index ede03e44d6..c33c3c2eb7 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -86,7 +86,7 @@ endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -94,7 +94,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(HOST_DIR)/bin/python3 $(SCONS) \ + $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/package/scons/scons.mk b/package/scons/scons.mk index a95fa7fd69..bc5d2a1ef9 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -18,4 +18,4 @@ HOST_SCONS_INSTALL_OPTS = \ $(eval $(host-python-package)) # variables used by other packages -SCONS = $(HOST_DIR)/bin/scons $(if $(QUIET),-s) +SCONS = $(HOST_DIR)/bin/python3 $(HOST_DIR)/bin/scons $(if $(QUIET),-s)