sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-29 08:30:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update lang/pypy to 2.1.b

Browse source 
Changes to port:
 * Abstract ${BUILDDIR} for files/Makefile
 * Remove MAKE_JOBS_SAFE (depreciated)
 * Use "USE_GCC=yes+" as recommended by portlint

Highlights:
 * Bugfixes to the ARM JIT backend, so that ARM is now an officially
supported processor architecture
 * Stacklet support on ARM
 * Interpreter improvements
 * Various numpy improvements
 * Bugfixes to cffi and ctypes
 * Bugfixes to the stacklet support
 * Improved logging performance
 * Faster sets for objects
This commit is contained in:
David Naylor 2013-07-28 20:10:03 +00:00
parent 2a562f4dd1
commit 9def36eeb5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=323849
9 changed files with 40 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lang/pypy/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= pypy PORTNAME= pypy
DISTVERSION= 2.0.2 DISTVERSION= 2.1-beta
CATEGORIES= lang python java CATEGORIES= lang python java
MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/ MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/
DISTNAME= ${PORTNAME}-${DISTVERSION}-src DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@ -40,7 +40,6 @@ ALL_TARGET= ${PYPY_NAMES}
BUILD_WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}
USE_BZIP2= yes USE_BZIP2= yes
USES= gettext iconv USES= gettext iconv
MAKE_JOBS_SAFE= yes
MAKEFILE= ${FILESDIR}/Makefile MAKEFILE= ${FILESDIR}/Makefile
PKGINSTALL= ${WRKDIR}/pkg-install PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
@ -58,8 +57,8 @@ PLIST_SUB+= PYPY_LIBDIR=${PYPY_LIBDIR} \
MAKE_ENV+= DISTVERSION=${DISTVERSION} PYTHON_CMD=${PYTHON_CMD} \ MAKE_ENV+= DISTVERSION=${DISTVERSION} PYTHON_CMD=${PYTHON_CMD} \
WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE} WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE}
LOCALBASE_REFIX= \ LOCALBASE_REFIX= \
lib/pypy2.0/lib_pypy/_sqlite3.py lib/pypy2.1/lib_pypy/_sqlite3.py
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.include "${MASTERDIR}/files/bsd.pypy.inst.mk" .include "${MASTERDIR}/files/bsd.pypy.inst.mk"
@ -68,7 +67,7 @@ LOCALBASE_REFIX= \
.if ${CC:T} == cc && ( exists(/usr/bin/clang) || exists(${LOCALBASE}/clang) ) .if ${CC:T} == cc && ( exists(/usr/bin/clang) || exists(${LOCALBASE}/clang) )
CC= clang CC= clang
.else .else
USE_GCC= yes USE_GCC= yes+
.endif .endif
.endif .endif
@ -281,7 +280,8 @@ post-build:
-${FIND} ${WRKSRC}/${PYPY_LIBDIR} -type d | \ -${FIND} ${WRKSRC}/${PYPY_LIBDIR} -type d | \
${SETENV} PYTHON_PATH=${WRKSRC} ${XARGS} \ ${SETENV} PYTHON_PATH=${WRKSRC} ${XARGS} \
${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl
.for mod in _sqlite3 _curses # UPDATING: check pypy/tool/release/package.py for list of cffi modules
.for mod in _sqlite3 _curses syslog
${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}' ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}'
.endfor .endfor
${FIND} ${WRKSRC}/lib -name '*.orig' -delete -or \ ${FIND} ${WRKSRC}/lib -name '*.orig' -delete -or \

4
lang/pypy/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (pypy-2.0.2-src.tar.bz2) = 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA256 (pypy-2.1-beta-src.tar.bz2) = 1ad205c1bf8c3d890aa007b975f45cfeb59d87b9063ad426f10da86f23ffadeb
SIZE (pypy-2.0.2-src.tar.bz2) = 14819848 SIZE (pypy-2.1-beta-src.tar.bz2) = 14821626

12
lang/pypy/files/Makefile
View file

@ -21,10 +21,12 @@ TOUCH?= touch
REINPLACE_CMD?= ${SED} -i~ REINPLACE_CMD?= ${SED} -i~
BUILDDIR= usession-release-${DISTVERSION:C/[0-9]*$/x/:C/-.*$/.x/}-0
.for inst in ${PYPY_INST} .for inst in ${PYPY_INST}
${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/testing_1/pypy-c ${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/pypy-c
${CP} build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/testing_1/pypy-c \ ${CP} build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/pypy-c \
${PYPY_${inst}_NAME} ${PYPY_${inst}_NAME}
.done_translate_${PYPY_${inst}_NAME}: .done_translate_${PYPY_${inst}_NAME}:
@ -36,7 +38,7 @@ ${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:
targetpypystandalone.py ${PYPY_${inst}_OBJSPACE_ARGS} ) targetpypystandalone.py ${PYPY_${inst}_OBJSPACE_ARGS} )
${TOUCH} .done_translate_${PYPY_${inst}_NAME} ${TOUCH} .done_translate_${PYPY_${inst}_NAME}
build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/testing_1/pypy-c: .done_translate_${PYPY_${inst}_NAME} build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/pypy-c: .done_translate_${PYPY_${inst}_NAME}
${REINPLACE_CMD} -e 's|^%.o: %.c$$|.c.o:|g' build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/testing_1/Makefile ${REINPLACE_CMD} -e 's|^%.o: %.c$$|.c.o:|g' build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/Makefile
/usr/bin/time -l ${MAKE} -C build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/testing_1 pypy-c /usr/bin/time -l ${MAKE} -C build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1 pypy-c
.endfor .endfor

4
lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
View file

@ -1,5 +1,5 @@
--- lib/pypy2.0/distutils/command/install.py.orig 2012-07-15 10:10:18.000000000 +0200 --- lib/pypy2.1/distutils/command/install.py.orig 2012-07-15 10:10:18.000000000 +0200
+++ lib/pypy2.0/distutils/command/install.py 2012-07-15 10:13:15.000000000 +0200 +++ lib/pypy2.1/distutils/command/install.py 2012-07-15 10:13:15.000000000 +0200
@@ -84,9 +84,9 @@ @@ -84,9 +84,9 @@
'data' : '$userbase', 'data' : '$userbase',
}, },

4
lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
View file

@ -1,5 +1,5 @@
--- lib/pypy2.0/distutils/sysconfig_pypy.py.orig 2012-11-22 14:52:20.000000000 +0200 --- lib/pypy2.1/distutils/sysconfig_pypy.py.orig 2012-11-22 14:52:20.000000000 +0200
+++ lib/pypy2.0/distutils/sysconfig_pypy.py 2012-11-27 17:59:44.000000000 +0200 +++ lib/pypy2.1/distutils/sysconfig_pypy.py 2012-11-27 17:59:44.000000000 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
def get_python_inc(plat_specific=0, prefix=None): def get_python_inc(plat_specific=0, prefix=None):

4
lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
View file

@ -1,5 +1,5 @@
--- lib/pypy2.0/lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200 --- lib/pypy2.1/lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200
+++ lib/pypy2.0/lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200 +++ lib/pypy2.1/lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200
@@ -270,7 +270,7 @@ @@ -270,7 +270,7 @@
_lib = _ffi.verify(""" _lib = _ffi.verify("""

4
lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
View file

@ -1,5 +1,5 @@
--- lib/pypy2.0/lib_pypy/ctypes_config_cache/rebuild.py.orig 2013-04-08 15:26:29.000000000 +0200 --- lib/pypy2.1/lib_pypy/ctypes_config_cache/rebuild.py.orig 2013-04-08 15:26:29.000000000 +0200
+++ lib/pypy2.0/lib_pypy/ctypes_config_cache/rebuild.py 2013-05-06 20:32:36.000000000 +0200 +++ lib/pypy2.1/lib_pypy/ctypes_config_cache/rebuild.py 2013-05-06 20:32:36.000000000 +0200
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
import os, sys import os, sys

4
lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
View file

@ -1,5 +1,5 @@
--- lib/pypy2.0/sysconfig.py.orig 2012-07-15 09:57:14.000000000 +0200 --- lib/pypy2.1/sysconfig.py.orig 2012-07-15 09:57:14.000000000 +0200
+++ lib/pypy2.0/sysconfig.py 2012-07-15 10:03:25.000000000 +0200 +++ lib/pypy2.1/sysconfig.py 2012-07-15 10:03:25.000000000 +0200
@@ -27,12 +27,12 @@ @@ -27,12 +27,12 @@
'data' : '{base}', 'data' : '{base}',
}, },

23
lang/pypy/pkg-plist
View file

@ -1450,8 +1450,9 @@
%%PYPY_LIBDIR%%/lib2to3/tests/test_util.pyc %%PYPY_LIBDIR%%/lib2to3/tests/test_util.pyc
%%PYPY_LIBDIR%%/lib_pypy/__init__.py %%PYPY_LIBDIR%%/lib_pypy/__init__.py
%%PYPY_LIBDIR%%/lib_pypy/__init__.pyc %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc
%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g178e1b25x1fd01a91.pypy-20.so %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3b3d68b9x310af836.pypy-21.so
%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g85535e98x310af836.pypy-20.so %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g7019d5d3xad93c709.pypy-21.so
%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g774d129dx1fd01a91.pypy-21.so
%%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py
%%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc
%%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py
@ -1509,6 +1510,8 @@
%%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.pyc %%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.pyc
%%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.py %%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.py
%%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.pyc %%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.pyc
%%PYPY_LIBDIR%%/lib_pypy/_pypy_testcapi.py
%%PYPY_LIBDIR%%/lib_pypy/_pypy_testcapi.pyc
%%PYPY_LIBDIR%%/lib_pypy/_pypy_wait.py %%PYPY_LIBDIR%%/lib_pypy/_pypy_wait.py
%%PYPY_LIBDIR%%/lib_pypy/_pypy_wait.pyc %%PYPY_LIBDIR%%/lib_pypy/_pypy_wait.pyc
%%PYPY_LIBDIR%%/lib_pypy/_scproxy.py %%PYPY_LIBDIR%%/lib_pypy/_scproxy.py
@ -1527,6 +1530,14 @@
%%PYPY_LIBDIR%%/lib_pypy/_subprocess.pyc %%PYPY_LIBDIR%%/lib_pypy/_subprocess.pyc
%%PYPY_LIBDIR%%/lib_pypy/_testcapi.py %%PYPY_LIBDIR%%/lib_pypy/_testcapi.py
%%PYPY_LIBDIR%%/lib_pypy/_testcapi.pyc %%PYPY_LIBDIR%%/lib_pypy/_testcapi.pyc
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/__init__.py
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/__init__.pyc
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/app.py
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/app.pyc
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.py
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.pyc
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib.py
%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib.pyc
%%PYPY_LIBDIR%%/lib_pypy/cPickle.py %%PYPY_LIBDIR%%/lib_pypy/cPickle.py
%%PYPY_LIBDIR%%/lib_pypy/cPickle.pyc %%PYPY_LIBDIR%%/lib_pypy/cPickle.pyc
%%PYPY_LIBDIR%%/lib_pypy/cStringIO.py %%PYPY_LIBDIR%%/lib_pypy/cStringIO.py
@ -1597,10 +1608,6 @@
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_resource_%%PYPY_BITS%%_.pyc %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_resource_%%PYPY_BITS%%_.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_resource_cache.py %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_resource_cache.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_resource_cache.pyc %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_resource_cache.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_syslog_%%PYPY_BITS%%_.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_syslog_%%PYPY_BITS%%_.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_syslog_cache.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/_syslog_cache.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/dumpcache.py %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/dumpcache.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/dumpcache.pyc %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/dumpcache.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/locale.ctc.py %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/locale.ctc.py
@ -1609,8 +1616,6 @@
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/rebuild.pyc %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/rebuild.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/resource.ctc.py %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/resource.ctc.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/resource.ctc.pyc %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/resource.ctc.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/syslog.ctc.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache/syslog.ctc.pyc
%%PYPY_LIBDIR%%/lib_pypy/ctypes_support.py %%PYPY_LIBDIR%%/lib_pypy/ctypes_support.py
%%PYPY_LIBDIR%%/lib_pypy/ctypes_support.pyc %%PYPY_LIBDIR%%/lib_pypy/ctypes_support.pyc
%%PYPY_LIBDIR%%/lib_pypy/datetime.py %%PYPY_LIBDIR%%/lib_pypy/datetime.py
@ -1621,6 +1626,7 @@
%%PYPY_LIBDIR%%/lib_pypy/disassembler.pyc %%PYPY_LIBDIR%%/lib_pypy/disassembler.pyc
%%PYPY_LIBDIR%%/lib_pypy/future_builtins.py %%PYPY_LIBDIR%%/lib_pypy/future_builtins.py
%%PYPY_LIBDIR%%/lib_pypy/future_builtins.pyc %%PYPY_LIBDIR%%/lib_pypy/future_builtins.pyc
%%PYPY_LIBDIR%%/lib_pypy/greenlet.egg-info
%%PYPY_LIBDIR%%/lib_pypy/greenlet.py %%PYPY_LIBDIR%%/lib_pypy/greenlet.py
%%PYPY_LIBDIR%%/lib_pypy/greenlet.pyc %%PYPY_LIBDIR%%/lib_pypy/greenlet.pyc
%%PYPY_LIBDIR%%/lib_pypy/grp.py %%PYPY_LIBDIR%%/lib_pypy/grp.py
@ -3788,6 +3794,7 @@
@dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/ply @dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/ply
@dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser @dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser
@dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi @dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi
@dirrm %%PYPY_LIBDIR%%/lib_pypy/_tkinter
@dirrm %%PYPY_LIBDIR%%/lib_pypy/_ctypes @dirrm %%PYPY_LIBDIR%%/lib_pypy/_ctypes
@dirrm %%PYPY_LIBDIR%%/lib_pypy/__pycache__ @dirrm %%PYPY_LIBDIR%%/lib_pypy/__pycache__
@dirrm %%PYPY_LIBDIR%%/lib_pypy @dirrm %%PYPY_LIBDIR%%/lib_pypy