diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-05-15 20:04:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-05-15 20:04:07 +0000 |
| commit | c33b01fa0ea4237e33e303c6173ec06758040056 (patch) | |
| tree | 379f9b2c84a2c722cc40fb502ee166c1a2b6cb32 | |
| parent | d3a21c192baf6fa2f6d9212efd156639bd922f51 (diff) | |
| download | upstream-c33b01fa0ea4237e33e303c6173ec06758040056.tar.gz upstream-c33b01fa0ea4237e33e303c6173ec06758040056.tar.bz2 upstream-c33b01fa0ea4237e33e303c6173ec06758040056.zip | |
scons: wrap python invocations with helper script that attempts to find a non-3.x python
SVN-Revision: 31742
| -rw-r--r-- | tools/scons/Makefile | 7 | ||||
| -rwxr-xr-x | tools/scons/files/pywrap.sh | 15 |
2 files changed, 21 insertions, 1 deletions
diff --git a/tools/scons/Makefile b/tools/scons/Makefile index aadeb289a2..83c1c584a5 100644 --- a/tools/scons/Makefile +++ b/tools/scons/Makefile @@ -23,7 +23,12 @@ define Host/Compile endef define Host/Install - python $(HOST_BUILD_DIR)/setup.py install --prefix=$(STAGING_DIR_HOST) + ./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 new file mode 100755 index 0000000000..336ea21c19 --- /dev/null +++ b/tools/scons/files/pywrap.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +case "${0##*/}" in + pywrap.sh) arg1="";; + *) arg1="$0.py" ;; +esac + +for bin in python2.7 python2.6 python2.5 python2.4 python2 python; do + case "$($bin -V 2>&1)" in + "Python 2"*) exec $bin $arg1 "$@" ;; + esac +done + +echo "Unable to find a Python 2.x interpreter for executing ${arg1:+$arg1 }$@ !" >&2 +exit 1 |