Browse Source

Merge pull request #13001 from neheb/sco

scons: update to 4.0.1
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
24ef62fded
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 7 deletions
  1. +9
    -4
      devel/scons/Makefile
  2. +3
    -3
      devel/scons/patches/001-platform_env.patch
  3. +10
    -0
      devel/scons/patches/002-fix-import-path.patch

+ 9
- 4
devel/scons/Makefile View File

@ -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


+ 3
- 3
devel/scons/patches/001-platform_env.patch View File

@ -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


+ 10
- 0
devel/scons/patches/002-fix-import-path.patch View File

@ -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"])

Loading…
Cancel
Save