On Sun, Sep 22, 2019 at 03:05:03PM +0100, Stuart Henderson wrote:
> ${PREFIX}/pypy/bin/pypy -m compileall ${PREFIX}/pypy/lib-python/2.7
Just that won't do because it'll fail with SyntaxErrors and what-not on
test files, but as of https://docs.python.org/2/library/compileall.html
there's `-x regex' to exclude files which works just fine.
No PLIST change with the following diff, *if* I run update-plist with
UPDATE_PLIST_ARGS='-i MODPY_PY_PREFIX -i MODPY_PY0EXTENSION -i MODPY_VERSION'
to escape the massive churn.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/pypy/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 22 Sep 2019 11:37:04 -0000 1.34
+++ Makefile 22 Sep 2019 20:04:59 -0000
@@ -121,22 +121,21 @@ do-install:
cp -rp ${WRKSRC}/lib-python/2.7/* ${PREFIX}/pypy/lib-python/2.7
${PYPY_LD_LIBRARY_PATH} ${PREFIX}/pypy/bin/pypy \
-m compileall ${PREFIX}/pypy/lib_pypy
- ${PYPY_LD_LIBRARY_PATH} sh -c \
- 'find ${PREFIX}/pypy/lib-python/2.7 -name "*.py" | grep -v test
\
- | xargs ${PREFIX}/pypy/bin/pypy -m compileall'
+ ${PYPY_LD_LIBRARY_PATH} ${PREFIX}/pypy/bin/pypy \
+ -m compileall -x test ${PREFIX}/pypy/lib-python/2.7
# make cffi shared objects
cd ${WRKSRC} && ${PYPY_LD_LIBRARY_PATH} \
LDFLAGS=-L${LOCALBASE}/lib \
CPPFLAGS=-I${LOCALBASE}/include \
PYTHONPATH=`pwd` \
${PREFIX}/pypy/bin/pypy pypy/tool/build_cffi_imports.py
- find ${PREFIX}/pypy/lib_pypy/ -name '*.c' -or -name '*.o' | xargs rm
+ find ${PREFIX}/pypy/lib_pypy/ -name '*.[co]' -delete
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/lib_pypy
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/lib-python/2.7
cd ${PREFIX}/bin && ln -s ../pypy/bin/pypy
cd ${PREFIX}/lib && ln -s ../pypy/lib/libpypy-c.so
# remove patch orig files so they dont appear in the plist
- find ${PREFIX} -name '*.py.orig' | xargs rm
+ find ${PREFIX} -name '*.py.orig' -delete
PYPY_PKG = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME}.tgz
