summaryrefslogtreecommitdiff
path: root/lang/pypy
diff options
context:
space:
mode:
authorDavid Naylor <dbn@FreeBSD.org>2013-07-28 20:10:03 +0000
committerDavid Naylor <dbn@FreeBSD.org>2013-07-28 20:10:03 +0000
commit9def36eeb51dc35da3b459802ecb7071b3dcdbab (patch)
tree8c8c67789e75871600c5ae8a30965d37a7343e3b /lang/pypy
parentmultimedia/cx88: update to 1.4.8 (diff)
Update lang/pypy to 2.1.b
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
Notes
Notes: svn path=/head/; revision=323849
Diffstat (limited to 'lang/pypy')
-rw-r--r--lang/pypy/Makefile12
-rw-r--r--lang/pypy/distinfo4
-rw-r--r--lang/pypy/files/Makefile12
-rw-r--r--lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py4
-rw-r--r--lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py4
-rw-r--r--lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py4
-rw-r--r--lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py4
-rw-r--r--lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py4
-rw-r--r--lang/pypy/pkg-plist23
9 files changed, 40 insertions, 31 deletions
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index eef367df08b6..abde358fd9ee 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pypy
-DISTVERSION= 2.0.2
+DISTVERSION= 2.1-beta
CATEGORIES= lang python java
MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@@ -40,7 +40,6 @@ ALL_TARGET= ${PYPY_NAMES}
BUILD_WRKSRC= ${WRKDIR}
USE_BZIP2= yes
USES= gettext iconv
-MAKE_JOBS_SAFE= yes
MAKEFILE= ${FILESDIR}/Makefile
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
@@ -58,8 +57,8 @@ PLIST_SUB+= PYPY_LIBDIR=${PYPY_LIBDIR} \
MAKE_ENV+= DISTVERSION=${DISTVERSION} PYTHON_CMD=${PYTHON_CMD} \
WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE}
-LOCALBASE_REFIX= \
- lib/pypy2.0/lib_pypy/_sqlite3.py
+LOCALBASE_REFIX= \
+ lib/pypy2.1/lib_pypy/_sqlite3.py
.include <bsd.port.options.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) )
CC= clang
.else
-USE_GCC= yes
+USE_GCC= yes+
.endif
.endif
@@ -281,7 +280,8 @@ post-build:
-${FIND} ${WRKSRC}/${PYPY_LIBDIR} -type d | \
${SETENV} PYTHON_PATH=${WRKSRC} ${XARGS} \
${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}'
.endfor
${FIND} ${WRKSRC}/lib -name '*.orig' -delete -or \
diff --git a/lang/pypy/distinfo b/lang/pypy/distinfo
index 074911fc80d0..d57f8c951a76 100644
--- a/lang/pypy/distinfo
+++ b/lang/pypy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pypy-2.0.2-src.tar.bz2) = 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c
-SIZE (pypy-2.0.2-src.tar.bz2) = 14819848
+SHA256 (pypy-2.1-beta-src.tar.bz2) = 1ad205c1bf8c3d890aa007b975f45cfeb59d87b9063ad426f10da86f23ffadeb
+SIZE (pypy-2.1-beta-src.tar.bz2) = 14821626
diff --git a/lang/pypy/files/Makefile b/lang/pypy/files/Makefile
index ac05b3e80ffb..d9f761efab7d 100644
--- a/lang/pypy/files/Makefile
+++ b/lang/pypy/files/Makefile
@@ -21,10 +21,12 @@ TOUCH?= touch
REINPLACE_CMD?= ${SED} -i~
+BUILDDIR= usession-release-${DISTVERSION:C/[0-9]*$/x/:C/-.*$/.x/}-0
+
.for inst in ${PYPY_INST}
-${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/testing_1/pypy-c
- ${CP} 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}/${BUILDDIR}/testing_1/pypy-c \
${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} )
${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}
- ${REINPLACE_CMD} -e 's|^%.o: %.c$$|.c.o:|g' build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION:C/[0-9]*$/x/}-0/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
+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}/${BUILDDIR}/testing_1/Makefile
+ /usr/bin/time -l ${MAKE} -C build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1 pypy-c
.endfor
diff --git a/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py b/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
index 482bbbe806c2..fbc6876d009d 100644
--- a/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
+++ b/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
@@ -1,5 +1,5 @@
---- lib/pypy2.0/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.orig 2012-07-15 10:10:18.000000000 +0200
++++ lib/pypy2.1/distutils/command/install.py 2012-07-15 10:13:15.000000000 +0200
@@ -84,9 +84,9 @@
'data' : '$userbase',
},
diff --git a/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py b/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
index fb7f17331d4a..3619db91ecf6 100644
--- a/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
+++ b/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
@@ -1,5 +1,5 @@
---- lib/pypy2.0/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.orig 2012-11-22 14:52:20.000000000 +0200
++++ lib/pypy2.1/distutils/sysconfig_pypy.py 2012-11-27 17:59:44.000000000 +0200
@@ -15,7 +15,7 @@
def get_python_inc(plat_specific=0, prefix=None):
diff --git a/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py b/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
index c943058d8767..ccc5a51b28e3 100644
--- a/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
+++ b/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
@@ -1,5 +1,5 @@
---- lib/pypy2.0/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.orig 2013-05-18 16:20:00.000000000 +0200
++++ lib/pypy2.1/lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200
@@ -270,7 +270,7 @@
_lib = _ffi.verify("""
diff --git a/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py b/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
index 7d86d2095057..98893a405edb 100644
--- a/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
+++ b/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
@@ -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.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.orig 2013-04-08 15:26:29.000000000 +0200
++++ lib/pypy2.1/lib_pypy/ctypes_config_cache/rebuild.py 2013-05-06 20:32:36.000000000 +0200
@@ -3,7 +3,7 @@
import os, sys
diff --git a/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py b/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
index d99c95a7ff94..3d03391fb63f 100644
--- a/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
+++ b/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
@@ -1,5 +1,5 @@
---- lib/pypy2.0/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.orig 2012-07-15 09:57:14.000000000 +0200
++++ lib/pypy2.1/sysconfig.py 2012-07-15 10:03:25.000000000 +0200
@@ -27,12 +27,12 @@
'data' : '{base}',
},
diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist
index d02f0db3e1b2..64fc51051e70 100644
--- a/lang/pypy/pkg-plist
+++ b/lang/pypy/pkg-plist
@@ -1450,8 +1450,9 @@
%%PYPY_LIBDIR%%/lib2to3/tests/test_util.pyc
%%PYPY_LIBDIR%%/lib_pypy/__init__.py
%%PYPY_LIBDIR%%/lib_pypy/__init__.pyc
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g178e1b25x1fd01a91.pypy-20.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g85535e98x310af836.pypy-20.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3b3d68b9x310af836.pypy-21.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.pyc
%%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py
@@ -1509,6 +1510,8 @@
%%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.pyc
%%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.py
%%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.pyc
%%PYPY_LIBDIR%%/lib_pypy/_scproxy.py
@@ -1527,6 +1530,14 @@
%%PYPY_LIBDIR%%/lib_pypy/_subprocess.pyc
%%PYPY_LIBDIR%%/lib_pypy/_testcapi.py
%%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.pyc
%%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_cache.py
%%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.pyc
%%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/resource.ctc.py
%%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.pyc
%%PYPY_LIBDIR%%/lib_pypy/datetime.py
@@ -1621,6 +1626,7 @@
%%PYPY_LIBDIR%%/lib_pypy/disassembler.pyc
%%PYPY_LIBDIR%%/lib_pypy/future_builtins.py
%%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.pyc
%%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
@dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi
+@dirrm %%PYPY_LIBDIR%%/lib_pypy/_tkinter
@dirrm %%PYPY_LIBDIR%%/lib_pypy/_ctypes
@dirrm %%PYPY_LIBDIR%%/lib_pypy/__pycache__
@dirrm %%PYPY_LIBDIR%%/lib_pypy
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-18 12:12:07 +0000