On 2019/09/22 15:37, Klemens Nanni wrote:
> On Sun, Sep 22, 2019 at 02:23:14PM +0200, Klemens Nanni wrote:
> > The bootstrap target uses xz(1) so add it as BDEP.
> sthen pointed out it's already there; indeed BOOTSTRAP-amd64 implicitly
> does by having the .xz extension.
>
> > Also use find(1)'s -delete and -exec commands and move variables before
> > targets while here.
> I also included other stuff that was not explained here (and frankly
> wasn't right as pointed out by sthen, thanks).
>
> So one thing at a time: let's just use find(1) appropiately.
> Sorry for the noise.
>
> Feedback? 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 13:37:21 -0000
> @@ -122,21 +122,21 @@ do-install:
> ${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'
> + 'find ${PREFIX}/pypy/lib-python/2.7 -name "*.py" ! -path
> "*test*" \
> + -exec ${PREFIX}/pypy/bin/pypy -m compileall +'
missing a "{}" I think, but I think the whole thing is a bit bogus in
the first place, compileall is meant to work on directories and is
recursive by default, so maybe it should just be
${PREFIX}/pypy/bin/pypy -m compileall ${PREFIX}/pypy/lib-python/2.7
but I know if I try a test build now it will make my workstation
unusable for hours+ and I don't really want to tie it up atm :-)
> # 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
>
>
ok
