svn commit: r411015 - head/lang/pypy
David Naylor
dbn at FreeBSD.org
Sun Mar 13 18:58:29 UTC 2016
Author: dbn
Date: Sun Mar 13 18:58:27 2016
New Revision: 411015
URL: https://svnweb.freebsd.org/changeset/ports/411015
Log:
lang/pypy: update to 5.0.0
Changes:
- Drop local mirror
- Drop DIST_SUBDIR (distfile name no longer a generic "release-x.y.z.tar.bz2".
- Add test dependencies (all sub-ports, a la gdbm, sqlite and tkinter)
- Use gmake instead of using sed to transform the Makefile
- Use options helper variables
- Rename regression-test -> do-test
ChangeLog (see http://morepypy.blogspot.co.za/2016/03/pypy-50-released.html):
- Faster and leaner: improved JIT warmed (up to 30% faster) and improved memory
consumption (dropped by about 30%).
- C-API Upgrade: cpyext is much faster and lxml now passes all tests when
using cython compiled components.
- CFFI: ships with cffi-1.5.2.
Modified:
head/lang/pypy/Makefile
head/lang/pypy/bsd.pypy.cffi.mk
head/lang/pypy/bsd.pypy.mk
head/lang/pypy/distinfo
head/lang/pypy/pkg-plist
Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile Sun Mar 13 18:45:42 2016 (r411014)
+++ head/lang/pypy/Makefile Sun Mar 13 18:58:27 2016 (r411015)
@@ -2,17 +2,19 @@
# $FreeBSD$
PORTNAME= pypy
-PORTVERSION= 4.0.1 # Also update bsd.pypy.cffi.mk
+PORTVERSION= 5.0.0 # Also update bsd.pypy.cffi.mk
CATEGORIES= lang python
-MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy
-DISTNAME= release-${DISTVERSION}
-DIST_SUBDIR= pypy
+MASTER_SITES= https://bitbucket.org/pypy/pypy/downloads/
+DISTVERSIONSUFFIX= -src
MAINTAINER= python at FreeBSD.org
COMMENT= Fast, compliant implementation of the Python language
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
libffi.so:${PORTSDIR}/devel/libffi
+TEST_DEPENDS= ${PREFIX}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.pypy-${PYPY_CFFI_VER}.so:${PORTSDIR}/databases/pypy-gdbm \
+ ${PREFIX}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.pypy-${PYPY_CFFI_VER}.so:${PORTSDIR}/databases/pypy-sqlite3 \
+ ${PREFIX}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.pypy-${PYPY_CFFI_VER}.so:${PORTSDIR}/x11-toolkits/pypy-tkinter
ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc64
ONLY_FOR_ARCHS_REASON= PyPy JIT only supported on these architectures
@@ -31,23 +33,18 @@ OPTIONS_DEFAULT+= PYPY_MINMEM
CONFLICTS_INSTALL= pypy3-[0-9]*
ALL_TARGET= pypy-c
-BUILD_WRKSRC= ${WRKDIR}/build/usession-release-${DISTVERSION}-0/testing_1
+BUILD_WRKSRC= ${WRKDIR}/build/usession-release-5.0-0/testing_1
MAKE_ENV+= PYPY_LOCALBASE=${LOCALBASE}
USE_LDCONFIG= ${PREFIX}/${PYPY_DIR}/bin
-USES= gettext-runtime tar:bzip2
-WRKSRC= ${WRKDIR}/pypy-pypy-5f8302b8bf9f
+USES= gettext-runtime gmake tar:bzip2
+
+PYPY_VARS= PYTHON_CMD=${LOCALBASE}/bin/pypy
+PYPY_MINMEM_VARS= PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
+PYTHON_USES= python:2,build
.include ".${CURDIR}/bsd.pypy.mk"
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MPYPY} || defined(PYTHON_CMD)
-PYTHON_CMD?= ${LOCALBASE}/bin/pypy
-.elif ${PORT_OPTIONS:MPYPY_MINMEM}
-PYTHON_CMD?= ${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300
-.else # if ${PORT_OPTIONS:MPYTHON}
-USES+= python:2,build
-.endif
-
.if ${ARCH} == "i386" || ${ARCH} == "armv6"
PYPY_BITS= 32
.elif ${ARCH} == "amd64" || ${ARCH} == "powerpc64"
@@ -62,7 +59,6 @@ pre-build:
(cd ${WRKSRC}/pypy/goal; \
${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \
${PYTHON_CMD} ../../rpython/bin/rpython --source -Ojit targetpypystandalone.py); \
- ${REINPLACE_CMD} -e 's|^%.o: %.c$$|.c.o:|g' ${BUILD_WRKSRC}/Makefile; \
fi
post-build:
@@ -75,7 +71,7 @@ do-install:
${EXTRACT_CMD} -C ${STAGEDIR}${PREFIX} -xf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2
${LN} -fs ../${PYPY_DIR}/bin/pypy ${STAGEDIR}${PREFIX}/bin/pypy
-regression-test: build
+do-test:
# See https://bitbucket.org/pypy/buildbot/src/default/bot2/pypybuildbot/builds.py?at=default#builds.py-386
# add_translated_tests()
(cd ${WRKSRC}; \
@@ -89,6 +85,9 @@ regression-test: build
${WRKSRC}/pypy/goal/pypy-c pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/pypy-c \
${dir} )
.endfor
+ (cd ${WRKSRC}/lib-python/2.7/test; \
+ ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
+ ${WRKSRC}/pypy/goal/pypy-c regrtest.py -vvu all)
pkg-plist: build
${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen
Modified: head/lang/pypy/bsd.pypy.cffi.mk
==============================================================================
--- head/lang/pypy/bsd.pypy.cffi.mk Sun Mar 13 18:45:42 2016 (r411014)
+++ head/lang/pypy/bsd.pypy.cffi.mk Sun Mar 13 18:58:27 2016 (r411015)
@@ -10,7 +10,7 @@ PLIST_FILES= %%PYPY_DIR%%/lib_pypy/${CFF
CFFI_MODULE?= _${PORTNAME}
-PYTHON_PORTVERSION= 4.0.1
+PYTHON_PORTVERSION= 5.0.0
PYTHON_PKGNAMEPREFIX= pypy-
PYTHON_CMD= ${LOCALBASE}/bin/pypy
Modified: head/lang/pypy/bsd.pypy.mk
==============================================================================
--- head/lang/pypy/bsd.pypy.mk Sun Mar 13 18:45:42 2016 (r411014)
+++ head/lang/pypy/bsd.pypy.mk Sun Mar 13 18:58:27 2016 (r411015)
@@ -6,5 +6,5 @@ LICENSE_COMB= multi
USES+= compiler:c11
PYPY_DIR= pypy-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
-PYPY_CFFI_VER= 26
+PYPY_CFFI_VER= 41
PLIST_SUB+= PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER}
Modified: head/lang/pypy/distinfo
==============================================================================
--- head/lang/pypy/distinfo Sun Mar 13 18:45:42 2016 (r411014)
+++ head/lang/pypy/distinfo Sun Mar 13 18:58:27 2016 (r411015)
@@ -1,2 +1,2 @@
-SHA256 (pypy/release-4.0.1.tar.bz2) = 743928a65a3a8731a1403003729f4a5cbefeaf7841e9eb677bd2b547e98df1bc
-SIZE (pypy/release-4.0.1.tar.bz2) = 17022282
+SHA256 (pypy-5.0.0-src.tar.bz2) = 89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab
+SIZE (pypy-5.0.0-src.tar.bz2) = 17223494
Modified: head/lang/pypy/pkg-plist
==============================================================================
--- head/lang/pypy/pkg-plist Sun Mar 13 18:45:42 2016 (r411014)
+++ head/lang/pypy/pkg-plist Sun Mar 13 18:58:27 2016 (r411015)
@@ -46,6 +46,7 @@ bin/pypy
%%PYPY_DIR%%/include/pyport.h
%%PYPY_DIR%%/include/pypy_decl.h
%%PYPY_DIR%%/include/pypy_macros.h
+%%PYPY_DIR%%/include/pypy_structmember_decl.h
%%PYPY_DIR%%/include/pysignals.h
%%PYPY_DIR%%/include/pystate.h
%%PYPY_DIR%%/include/pythonrun.h
@@ -1254,10 +1255,12 @@ bin/pypy
%%PYPY_DIR%%/lib-python/2.7/test/badsyntax_future9.py
%%PYPY_DIR%%/lib-python/2.7/test/badsyntax_nocaret.py
%%PYPY_DIR%%/lib-python/2.7/test/buffer_tests.py
+%%PYPY_DIR%%/lib-python/2.7/test/capath/0e4015b9.0
%%PYPY_DIR%%/lib-python/2.7/test/capath/4e1295a3.0
%%PYPY_DIR%%/lib-python/2.7/test/capath/5ed36f99.0
%%PYPY_DIR%%/lib-python/2.7/test/capath/6e88d7b8.0
%%PYPY_DIR%%/lib-python/2.7/test/capath/99d0fa06.0
+%%PYPY_DIR%%/lib-python/2.7/test/capath/ce7b8643.0
%%PYPY_DIR%%/lib-python/2.7/test/cfgparser.1
%%PYPY_DIR%%/lib-python/2.7/test/check_soundcard.vbs
%%PYPY_DIR%%/lib-python/2.7/test/cjkencodings/big5-utf8.txt
@@ -1461,7 +1464,6 @@ bin/pypy
%%PYPY_DIR%%/lib-python/2.7/test/formatfloat_testcases.txt
%%PYPY_DIR%%/lib-python/2.7/test/gdb_sample.py
%%PYPY_DIR%%/lib-python/2.7/test/greyrgb.uue
-%%PYPY_DIR%%/lib-python/2.7/test/https_svn_python_org_root.pem
%%PYPY_DIR%%/lib-python/2.7/test/ieee754.txt
%%PYPY_DIR%%/lib-python/2.7/test/imghdrdata/python.bmp
%%PYPY_DIR%%/lib-python/2.7/test/imghdrdata/python.gif
@@ -2109,6 +2111,7 @@ bin/pypy
%%PYPY_DIR%%/lib_pypy/cffi.egg-info/top_level.txt
%%PYPY_DIR%%/lib_pypy/cffi/__init__.py
%%PYPY_DIR%%/lib_pypy/cffi/_cffi_include.h
+%%PYPY_DIR%%/lib_pypy/cffi/_embedding.h
%%PYPY_DIR%%/lib_pypy/cffi/_pycparser/README
%%PYPY_DIR%%/lib_pypy/cffi/_pycparser/__init__.py
%%PYPY_DIR%%/lib_pypy/cffi/_pycparser/_ast_gen.py
More information about the svn-ports-head
mailing list