On 7/28/19 11:31 PM, Petr Štetiar wrote:
> This patch removes scons host build tool, as commit 0c090fde68b2
> ("scons: move host build tool to a proper place") in the packages feed
> has moved scons into the new home.
>
> There are currently no packages in the master tree which would need
> scons, yet scons is build always as part of host tools, just in order to
> satisfy host build dependency of few packages in the packages feeds.
>
> Signed-off-by: Petr Štetiar <[email protected]>Acked-by: Hauke Mehrtens <[email protected]> > --- > tools/Makefile | 2 +- > tools/scons/Makefile | 35 ---------------------- > tools/scons/files/pywrap.sh | 15 ---------- > tools/scons/patches/001-platform_env.patch | 11 ------- > 4 files changed, 1 insertion(+), 62 deletions(-) > delete mode 100644 tools/scons/Makefile > delete mode 100755 tools/scons/files/pywrap.sh > delete mode 100644 tools/scons/patches/001-platform_env.patch > > diff --git a/tools/Makefile b/tools/Makefile > index d7207ba89dd9..a161154b806b 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 5ec655416585..000000000000 > --- 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.0.5 > - > -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz > -PKG_SOURCE_URL:=@SF/scons \ > - http://fossies.org/linux/misc/ > -PKG_HASH:=df676f23dc6d4bfa384fc389d95dcd21ab907e6349d4c848958ba4befb73c73e > - > -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 53910e947209..000000000000 > --- 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 2be31470c27d..000000000000 > --- 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': > > _______________________________________________ > openwrt-devel mailing list > [email protected] > https://lists.openwrt.org/mailman/listinfo/openwrt-devel >
signature.asc
Description: OpenPGP digital signature
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
