From fa4bca16f65b41f3045957ccb0f51b9836a43f46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Tue, 19 Mar 2019 12:34:26 +0000 Subject: [PATCH] tools/scons: switch to Python 3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Build tested on ath79 with following packages from packages feed which build depends on scons. None of them build anymore as it seems, that the SConscripts are written for Python2. * packages/net/iotivity (KO, doesn't build even with latest 1.3.1 release) SyntaxError: invalid syntax File "/openwrt/build_dir/target-mips_24kc_musl/iotivity-1.2.1/build_common/SConscript", line 40 print "\nError: Current system (%s) isn't supported\n" % host LookupError: unknown encoding: string_escape: File "/home/petr/testing/openwrt/build_dir/target-mips_24kc_musl/iotivity-1.3.1/SConstruct", line 28: SConscript('build_common/SConscript') * packages/net/smartsnmpd (KO, seems dead, no commit since 2015): SyntaxError: Missing parentheses in call to 'print' File "/openwrt/build_dir/target-mips_24kc_musl/smartsnmpd-2014-08-13/SConstruct", line 156 print "Can't find liblua or liblua5.1!" * packages/utils/gpsd (KO, doesn't build even with latest 3.18.1 release): AttributeError: 'list' object has no attribute 'keys': File "/openwrt/build_dir/target-mips_24kc_musl/gpsd-3.18.1/SConstruct", line 1758: all_manpages = list(base_manpages.keys()) + list(python_manpages.keys()) Signed-off-by: Petr Å tetiar --- tools/scons/files/pywrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/scons/files/pywrap.sh b/tools/scons/files/pywrap.sh index f62f590e0b..53910e9472 100755 --- a/tools/scons/files/pywrap.sh +++ b/tools/scons/files/pywrap.sh @@ -5,11 +5,11 @@ case "${0##*/}" in *) arg1="$0.py" ;; esac -for bin in python python2 python2.7 python2.6 python2.5 python2.4; do +for bin in python python3; do case "$($bin -V 2>&1)" in - "Python 2"*) exec $bin $arg1 "$@" ;; + "Python 3"*) exec $bin $arg1 "$@" ;; esac done -echo "Unable to find a Python 2.x interpreter for executing ${arg1:+$arg1 }$@ !" >&2 +echo "Unable to find a Python 3.x interpreter for executing ${arg1:+$arg1 }$@ !" >&2 exit 1 -- 2.30.2