From ab3d5a5f5e9be354f8fcde9ebd85eebc21c4379c Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 10 Nov 2023 08:58:25 -0700 Subject: [PATCH] package/scons: bump version to 4.5.2 - Switch to setuptools - Update License hash due to a year change: 2019 -> 2021 - Install the packages to the site-packages directory, or else packages using scons fail to build with import errors. Tested with benejson, gpsd, and mongodb. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/scons/scons.hash | 4 ++-- package/scons/scons.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/scons/scons.hash b/package/scons/scons.hash index a72fbaee5a..48b5077b2e 100644 --- a/package/scons/scons.hash +++ b/package/scons/scons.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb scons-3.1.2.tar.gz -sha256 72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6 LICENSE.txt +sha256 ce26aac95d350a79a4192196b0beac3cb24f4ccabce0123eb28d3370f576f072 SCons-4.5.2.tar.gz +sha256 2f6ac9a1fc98394d18b80dba9bedb9d5626006d44db3fecf7cf3e21cff7e8b1c LICENSE diff --git a/package/scons/scons.mk b/package/scons/scons.mk index 6b75d3ddca..ffd6abf609 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -4,14 +4,15 @@ # ################################################################################ -SCONS_VERSION = 3.1.2 +SCONS_VERSION = 4.5.2 +SCONS_SOURCE = SCons-$(SCONS_VERSION).tar.gz SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION) SCONS_LICENSE = MIT -SCONS_LICENSE_FILES = LICENSE.txt -SCONS_SETUP_TYPE = distutils +SCONS_LICENSE_FILES = LICENSE +SCONS_SETUP_TYPE = setuptools HOST_SCONS_INSTALL_OPTS = \ - --install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION) + --install-lib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages $(eval $(host-python-package))