diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-22 11:38:12 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-22 11:40:53 +0200 |
| commit | 847b87119484e02a4833b2611f63db5a732c9398 (patch) | |
| tree | 26e11aae46a4ecacc2dc2e35f9e0c769d599bfcc | |
| parent | 720e7677539f76e32d879f42e1e0374c08698305 (diff) | |
| download | ptxdist-847b87119484e02a4833b2611f63db5a732c9398.tar.gz ptxdist-847b87119484e02a4833b2611f63db5a732c9398.tar.xz | |
Revert "host-python3-scons: version bump 3.1.2 -> 4.0.1"
It's not really needed right now and it fails to install properly on Ubuntu
16.04.
This reverts commit 88f3b4ec4f40b7e7f1459f17f0e1fdf45eae1dd9.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-python3-scons.make | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/rules/host-python3-scons.make b/rules/host-python3-scons.make index 15e95c0e4..d790e81c8 100644 --- a/rules/host-python3-scons.make +++ b/rules/host-python3-scons.make @@ -14,15 +14,15 @@ HOST_PACKAGES-$(PTXCONF_HOST_PYTHON3_SCONS) += host-python3-scons # # Paths and names # -HOST_PYTHON3_SCONS_VERSION := 4.0.1 -HOST_PYTHON3_SCONS_MD5 := 1567d695c457f791207a224feb2fefef +HOST_PYTHON3_SCONS_VERSION := 3.1.2 +HOST_PYTHON3_SCONS_MD5 := 77b2f8ac2661b7a4fad51c17cb7f1b25 HOST_PYTHON3_SCONS := python-scons-$(HOST_PYTHON3_SCONS_VERSION) HOST_PYTHON3_SCONS_SUFFIX := tar.gz -HOST_PYTHON3_SCONS_URL := https://github.com/SCons/scons/archive/$(HOST_PYTHON3_SCONS_VERSION).$(HOST_PYTHON3_SCONS_SUFFIX) +HOST_PYTHON3_SCONS_URL := $(call ptx/mirror, SF, scons/scons-$(HOST_PYTHON3_SCONS_VERSION).$(HOST_PYTHON3_SCONS_SUFFIX)) HOST_PYTHON3_SCONS_SOURCE := $(SRCDIR)/$(HOST_PYTHON3_SCONS).$(HOST_PYTHON3_SCONS_SUFFIX) HOST_PYTHON3_SCONS_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON3_SCONS) HOST_PYTHON3_SCONS_LICENSE := MIT -HOST_PYTHON3_SCONS_LICENSE_FILES := file://LICENSE;md5=b94c6e2be9670c62b38f7118c12866d2 +HOST_PYTHON3_SCONS_LICENSE_FILES := file://LICENSE.txt;md5=e14e1b33428df24a40a782ae142785d0 # ---------------------------------------------------------------------------- # Prepare @@ -30,21 +30,4 @@ HOST_PYTHON3_SCONS_LICENSE_FILES := file://LICENSE;md5=b94c6e2be9670c62b38f7118c HOST_PYTHON3_SCONS_CONF_TOOL := python3 - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -HOST_PYTHON3_SCONS_INSTALL_OPT := \ - $(HOST_PYTHON_INSTALL) \ - --install-lib /lib/scons - -$(STATEDIR)/host-python3-scons.install: - @$(call targetinfo) - @$(call world/install, HOST_PYTHON3_SCONS) - @mv $(HOST_PYTHON3_SCONS_PKGDIR)/bin/scons $(HOST_PYTHON3_SCONS_PKGDIR)/bin/scons.orig - @echo -e '#!/bin/sh\nPYTHONPATH=$$(dirname $$0)/../lib/scons exec $${0}.orig "$${@}"' > \ - $(HOST_PYTHON3_SCONS_PKGDIR)/bin/scons - @chmod +x $(HOST_PYTHON3_SCONS_PKGDIR)/bin/scons - @$(call touch) # vim: syntax=make |