diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-05 00:59:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 00:59:32 -0700 |
| commit | 24ef62fded94746748aec2d13cc683fadb49791c (patch) | |
| tree | 329e891f289a44841761d8835a2b8a793e939b27 | |
| parent | c4254a382416a94feff29a91f89582dd81073c81 (diff) | |
| parent | 572e34843a596e036e57471c9a2b019609d00df2 (diff) | |
Merge pull request #13001 from neheb/sco
scons: update to 4.0.1
| -rw-r--r-- | devel/scons/Makefile | 13 | ||||
| -rw-r--r-- | devel/scons/patches/001-platform_env.patch | 6 | ||||
| -rw-r--r-- | devel/scons/patches/002-fix-import-path.patch | 10 |
3 files changed, 22 insertions, 7 deletions
diff --git a/devel/scons/Makefile b/devel/scons/Makefile index 13e636f03..ae052ba99 100644 --- a/devel/scons/Makefile +++ b/devel/scons/Makefile @@ -8,15 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scons -PKG_VERSION:=3.1.2 +PKG_VERSION:=4.0.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-local-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/scons -PKG_HASH:=642e90860b746fa18fac08c7a22de6bfa86110ae7c56d7f136f7e5fb0d8f4f44 +PKG_HASH:=23c9d37a008b525bdedfe2666a28b9466c4c945d8ba379873cfd0b9006a3d618 +PKG_MAINTAINER:= PKG_LICENSE:=MIT PKG_LICENSE_FILES:=scons-LICENSE -PKG_MAINTAINER:= + +PKG_HOST_ONLY:=1 +HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk @@ -27,7 +31,8 @@ define Package/scons SECTION:=devel CATEGORY:=Development TITLE:=scons - HIDDEN:=1 + URL:=https://scons.org/ + BUILDONLY:=1 endef define Package/scons/description diff --git a/devel/scons/patches/001-platform_env.patch b/devel/scons/patches/001-platform_env.patch index 4e4dc2b8e..641fdc7cf 100644 --- a/devel/scons/patches/001-platform_env.patch +++ b/devel/scons/patches/001-platform_env.patch @@ -1,6 +1,6 @@ ---- a/scons-local-3.1.2/SCons/Platform/__init__.py -+++ b/scons-local-3.1.2/SCons/Platform/__init__.py -@@ -65,6 +65,8 @@ def platform_default(): +--- a/scons-local-4.0.1/SCons/Platform/__init__.py ++++ b/scons-local-4.0.1/SCons/Platform/__init__.py +@@ -63,6 +63,8 @@ def platform_default(): care about the machine architecture. """ osname = os.name diff --git a/devel/scons/patches/002-fix-import-path.patch b/devel/scons/patches/002-fix-import-path.patch new file mode 100644 index 000000000..2c72cba1e --- /dev/null +++ b/devel/scons/patches/002-fix-import-path.patch @@ -0,0 +1,10 @@ +--- a/scons.py ++++ b/scons.py +@@ -56,6 +56,7 @@ if script_path in sys.path: + sys.path.remove(script_path) + + libs = [] ++libs = [os.path.join(os.path.dirname(script_dir), 'lib', 'scons')] + + if "SCONS_LIB_DIR" in os.environ: + libs.append(os.environ["SCONS_LIB_DIR"]) |