From 5b5546adf1c15ec250bd775211236e2f64978c53 Mon Sep 17 00:00:00 2001 From: Markus Teufelberger Date: Sat, 12 Jan 2019 15:04:33 +0100 Subject: [PATCH] bootstrap-os: Install pypy3 portable --- roles/bootstrap-os/files/bootstrap.sh | 21 ++++----------------- roles/bootstrap-os/templates/python_shim.j2 | 2 -- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 roles/bootstrap-os/templates/python_shim.j2 diff --git a/roles/bootstrap-os/files/bootstrap.sh b/roles/bootstrap-os/files/bootstrap.sh index e54f4eaa2..631dd34c0 100755 --- a/roles/bootstrap-os/files/bootstrap.sh +++ b/roles/bootstrap-os/files/bootstrap.sh @@ -11,25 +11,12 @@ if [[ -e $BINDIR/.bootstrapped ]]; then exit 0 fi -PYPY_VERSION=v6.0.0 +PYPY_VERSION=6.0.0 -wget -O - https://bitbucket.org/pypy/pypy/downloads/pypy3-$PYPY_VERSION-linux64.tar.bz2 | tar -xjf - -mv -n pypy3-$PYPY_VERSION-linux64 pypy3 +wget -O - https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-$PYPY_VERSION-linux_x86_64-portable.tar.bz2 | tar -xjf - +mv -n pypy3.5-$PYPY_VERSION-linux_x86_64-portable pypy3 -## library fixup -mkdir -p pypy3/lib -if [ -f /lib64/libncurses.so.5.9 ]; then - ln -snf /lib64/libncurses.so.5.9 $BINDIR/pypy3/lib/libtinfo.so.5 -elif [ -f /lib64/libncurses.so.6.1 ]; then - ln -snf /lib64/libncurses.so.6.1 $BINDIR/pypy3/lib/libtinfo.so.5 -fi - -cat > $BINDIR/python <