Enable PyPy as possible SR Python

component/pycurl/buildout.cfg

@@ -8,15 +8,15 @@ parts =
 
 [pycurl-env]
 PATH = ${curl:location}/bin:${openssl:location}/bin:%(PATH)s
-PYCURL_SSL_LIBRARY=openssl
-CPPFLAGS=-I${openssl:location}/include
-CFLAGS=-I${openssl:location}/include
+PYCURL_SSL_LIBRARY = openssl
 
 [pycurl]
 recipe = zc.recipe.egg:custom
 egg = pycurl
-
-rpath =
-  ${curl:location}/lib/
-  ${openssl:location}/lib/
+include-dirs =
+  ${openssl:location}/include
+library-dirs =
+  ${openssl:location}/lib
+rpath = ${:library-dirs}
+  ${curl:location}/lib
 environment = pycurl-env

component/pypy/buildout.cfg

@@ -18,17 +18,19 @@ url = https://github.com/eliben/pycparser/archive/release_v2.20.tar.gz
 md5sum = a5d9ea5350a8edb8239af73913ea2858
 configure-command = :
 make-binary =
-make-targets = python setup.py install --install-lib @@LOCATION@@
+make-targets = python setup.py install --install-lib %(location)s
 
 [pypy2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://downloads.python.org/pypy/pypy2.7-v7.3.1-src.tar.bz2
+version = 2.7
+executable = @@LOCATION@@/bin/pypy
+url = https://downloads.python.org/pypy/pypy${:version}-v7.3.1-src.tar.bz2
 md5sum = 7608bd58940ffc5403632c2c786d83bb
 configure-command =
   sed -i '/"_tkinter":/s/^/#/' lib_pypy/tools/build_cffi_imports.py
   cat <<EOF > Makefile
-  PREFIX = @@LOCATION@@
+  PREFIX = %(location)s
   export PYPY_USESSION_BASENAME=slapos
   export TMPDIR=\$(realpath ..)
   all: pypy/goal/pypy-c lib_pypy/tools/build_cffi_imports.py
@@ -42,12 +44,17 @@ configure-command =
   	touch \$@
   install:
   	mkdir -p \$(PREFIX)/bin \$(PREFIX)/include
-  	find lib_pypy lib-python/2.7 -type d '(' '(' -name __pycache__ -o -name _tkinter -o -name test -o -name tests ')' -prune -o -print ')' \
+  	find lib_pypy lib-python/%(version)s -type d '(' '(' -name __pycache__ -o -name _tkinter -o -name test -o -name tests ')' -prune -o -print ')' \
   	|while read d; do mkdir -p \$(PREFIX)/\$\$d && find \$\$d -maxdepth 1 -type f ! -name '*.o' ! -name '*.c' |xargs -r cp -t \$(PREFIX)/\$\$d; done
-  	d=lib-python/2.7/test && mkdir -p \$(PREFIX)/\$\$d && for x in __init__ pystone regrtest test_support; do echo \$\$d/\$\$x.py; done |xargs -r cp -t \$(PREFIX)/\$\$d
+  	d=lib-python/%(version)s/test && mkdir -p \$(PREFIX)/\$\$d && for x in __init__ pystone regrtest test_support; do echo \$\$d/\$\$x.py; done |xargs -r cp -t \$(PREFIX)/\$\$d
   	cd lib-python && cp conftest.py stdlib-version.* \$(PREFIX)/lib-python
   	cp -r include/pypy_*.h include/PyPy.h pypy/module/cpyext/include/* pypy/module/cpyext/parse/* \$(PREFIX)/include
   	cd pypy/goal && cp libpypy-c.so \$(PREFIX)/bin && cp pypy-c \$(PREFIX)/bin/pypy
+post-install =
+  cd '%(location)s/bin'
+  for x in '' 2 %(version)s
+  do ln -s pypy python$x
+  done
 environment =
   C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -L${gdbm:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib