diff options
| -rw-r--r-- | include/scons.mk | 23 | ||||
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/scons/Makefile | 35 | ||||
| -rwxr-xr-x | tools/scons/files/pywrap.sh | 15 | ||||
| -rw-r--r-- | tools/scons/patches/001-platform_env.patch | 11 |
5 files changed, 1 insertions, 85 deletions
diff --git a/include/scons.mk b/include/scons.mk deleted file mode 100644 index 2b76710542..0000000000 --- a/include/scons.mk +++ /dev/null @@ -1,23 +0,0 @@ -export PLATFORM=posix - -SCONS_VARS = \ - CC="$(TARGET_CC_NOCACHE)" \ - CXX="$(TARGET_CXX_NOCACHE)" \ - CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" - -define Build/Configure/Default - (cd $(PKG_BUILD_DIR); \ - $(SCONS_VARS) \ - scons \ - prefix=/usr \ - $(SCONS_OPTIONS) \ - install \ - ) -endef - -define Build/Compile -endef diff --git a/tools/Makefile b/tools/Makefile index d7207ba89d..a161154b80 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,7 @@ tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat tools-y += m4 libtool autoconf automake flex bison pkg-config mklibs zlib tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-image quilt padjffs2 -tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf +tools-y += mm-macros missing-macros cmake bc findutils gengetopt patchelf tools-y += mtools dosfstools libressl tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_TARGET_x86) += qemu diff --git a/tools/scons/Makefile b/tools/scons/Makefile deleted file mode 100644 index a9f2507835..0000000000 --- a/tools/scons/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2011-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=scons -PKG_VERSION:=3.1.1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/scons \ - http://fossies.org/linux/misc/ -PKG_HASH:=4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5 - -include $(INCLUDE_DIR)/host-build.mk - -define Host/Configure -endef - -define Host/Compile -endef - -define Host/Install - ./files/pywrap.sh $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST) - rm -f $(STAGING_DIR_HOST)/bin/scons*.py - for bin in $(STAGING_DIR_HOST)/bin/scons*; do \ - mv "$$$$bin" "$$$$bin.py"; \ - cp ./files/pywrap.sh "$$$$bin"; \ - done -endef - -$(eval $(call HostBuild)) diff --git a/tools/scons/files/pywrap.sh b/tools/scons/files/pywrap.sh deleted file mode 100755 index 53910e9472..0000000000 --- a/tools/scons/files/pywrap.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -case "${0##*/}" in - pywrap.sh) arg1="";; - *) arg1="$0.py" ;; -esac - -for bin in python python3; do - case "$($bin -V 2>&1)" in - "Python 3"*) exec $bin $arg1 "$@" ;; - esac -done - -echo "Unable to find a Python 3.x interpreter for executing ${arg1:+$arg1 }$@ !" >&2 -exit 1 diff --git a/tools/scons/patches/001-platform_env.patch b/tools/scons/patches/001-platform_env.patch deleted file mode 100644 index 2be31470c2..0000000000 --- a/tools/scons/patches/001-platform_env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/engine/SCons/Platform/__init__.py -+++ b/engine/SCons/Platform/__init__.py -@@ -65,6 +65,8 @@ def platform_default(): - care about the machine architecture. - """ - osname = os.name -+ if 'PLATFORM' in os.environ: -+ return os.environ['PLATFORM'] - if osname == 'java': - osname = os._osType - if osname == 'posix': |