svn commit: r324198 - in head/lang/pypy: . files
David Naylor
dbn at FreeBSD.org
Sat Aug 3 16:18:52 UTC 2013
Author: dbn
Date: Sat Aug 3 16:18:49 2013
New Revision: 324198
URL: http://svnweb.freebsd.org/changeset/ports/324198
Log:
Update lang/pypy to 2.1.
Changes:
- Rename the binary, include and library to pypy-2.1 (recommended by mva@).
This is in preparation to introduce PyPy3 (PyPy implementing Python 3.2)
Highlights:
* JIT support for ARM, architecture versions 6 and 7, hard- and soft-float ABI
* Stacklet support for ARM
* Support for os.statvfs and os.fstatvfs on unix systems
* Improved logging performance
* Faster sets for objects
* Interpreter improvements
* During packaging, compile the CFFI based TK extension
* Pickling of numpy arrays and dtypes
* Subarrays for numpy
* Bugfixes to numpy
* Bugfixes to cffi and ctypes
* Bugfixes to the x86 stacklet support
* Fixed issue 1533: fix an RPython-level OverflowError for
space.float_w(w_big_long_number). https://bugs.pypy.org/issue1533
* Fixed issue 1552: GreenletExit should inherit from BaseException.
https://bugs.pypy.org/issue1552
* Fixed issue 1537: numpypy __array_interface__ https://bugs.pypy.org/issue1537
* Fixed issue 1238: Writing to an SSL socket in PyPy sometimes failed with a
"bad write retry" message. https://bugs.pypy.org/issue1238
Modified:
head/lang/pypy/Makefile
head/lang/pypy/distinfo
head/lang/pypy/files/Makefile
head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
head/lang/pypy/files/patch-pypy__module__sys__initpath.py
head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
head/lang/pypy/files/patch-pypy__tool__lib_pypy.py
head/lang/pypy/files/use.pypy
Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/Makefile Sat Aug 3 16:18:49 2013 (r324198)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pypy
-DISTVERSION= 2.1-beta2
+DISTVERSION= 2.1
CATEGORIES= lang python java
MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
@@ -47,8 +47,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
PYPY_VER= ${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
PYTHON_IMPL_VER= 2.7
-PYPY_LIBDIR= lib/pypy${PYPY_VER}
-PYPY_INCLUDEDIR= include/pypy${PYPY_VER}
+PYPY_LIBDIR= lib/pypy-${PYPY_VER}
+PYPY_INCLUDEDIR= include/pypy-${PYPY_VER}
PYPYDIRS= ${PYPY_INCLUDEDIR} ${PYPY_LIBDIR}
PLIST_SUB+= PYPY_LIBDIR=${PYPY_LIBDIR} \
@@ -58,7 +58,7 @@ MAKE_ENV+= DISTVERSION=${DISTVERSION} PY
WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE}
LOCALBASE_REFIX= \
- lib/pypy2.1/lib_pypy/_sqlite3.py
+ ${PYPY_LIBDIR}/lib_pypy/_sqlite3.py
.include <bsd.port.options.mk>
.include "${MASTERDIR}/files/bsd.pypy.inst.mk"
@@ -299,8 +299,8 @@ do-install:
.endfor
.for name in ${PYPY_NAMES:O}
${STRIP_CMD} ${WRKDIR}/${name}
- ${INSTALL_PROGRAM} ${WRKDIR}/${name} ${PREFIX}/bin/${name}${PYPY_VER}
- ${ECHO} bin/${name}${PYPY_VER} >> ${TMPPLIST}
+ ${INSTALL_PROGRAM} ${WRKDIR}/${name} ${PREFIX}/bin/${name}-${PYPY_VER}
+ ${ECHO} bin/${name}-${PYPY_VER} >> ${TMPPLIST}
.endfor
post-install:
Modified: head/lang/pypy/distinfo
==============================================================================
--- head/lang/pypy/distinfo Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/distinfo Sat Aug 3 16:18:49 2013 (r324198)
@@ -1,2 +1,2 @@
-SHA256 (pypy-2.1-beta2-src.tar.bz2) = d9d13848959f2f6d4904b7693d74d1b307e7a2b5c10112252c37255ce8ff10de
-SIZE (pypy-2.1-beta2-src.tar.bz2) = 14817369
+SHA256 (pypy-2.1-src.tar.bz2) = 31b3066c9739b117d6bb1bdc485a919dc3b67370ec00437de1b74069943f7f17
+SIZE (pypy-2.1-src.tar.bz2) = 14830606
Modified: head/lang/pypy/files/Makefile
==============================================================================
--- head/lang/pypy/files/Makefile Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/Makefile Sat Aug 3 16:18:49 2013 (r324198)
@@ -21,7 +21,7 @@ TOUCH?= touch
REINPLACE_CMD?= ${SED} -i~
-BUILDDIR= usession-release-${DISTVERSION:C/[0-9]*$/x/:C/-.*$/.x/}-0
+BUILDDIR= usession-release-${DISTVERSION}.x-0
.for inst in ${PYPY_INST}
Modified: head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
==============================================================================
--- head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -1,5 +1,5 @@
---- 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
+--- lib/pypy-2.1/distutils/command/install.py.orig 2012-07-15 10:10:18.000000000 +0200
++++ lib/pypy-2.1/distutils/command/install.py 2012-07-15 10:13:15.000000000 +0200
@@ -84,9 +84,9 @@
'data' : '$userbase',
},
@@ -7,9 +7,9 @@
- 'purelib': '$base/site-packages',
- 'platlib': '$base/site-packages',
- 'headers': '$base/include',
-+ 'purelib': '$base/lib/pypy$pypy_version_short/site-packages',
-+ 'platlib': '$platbase/lib/pypy$pypy_version_short/site-packages',
-+ 'headers': '$base/include/pypy$pypy_version_short/$dist_name',
++ 'purelib': '$base/lib/pypy-$pypy_version_short/site-packages',
++ 'platlib': '$platbase/lib/pypy-$pypy_version_short/site-packages',
++ 'headers': '$base/include/pypy-$pypy_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
},
Modified: head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
==============================================================================
--- head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -1,11 +1,11 @@
---- 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
+--- lib/pypy-2.1/distutils/sysconfig_pypy.py.orig 2012-11-22 14:52:20.000000000 +0200
++++ lib/pypy-2.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):
from os.path import join as j
- return j(sys.prefix, 'include')
-+ return j(sys.prefix, 'include', 'pypy%s.%s' % sys.pypy_version_info[:2])
++ return j(sys.prefix, 'include', 'pypy-%s.%s' % sys.pypy_version_info[:2])
def get_python_version():
"""Return a string containing the major and minor Python version,
@@ -15,8 +15,8 @@
if standard_lib:
- return os.path.join(prefix, "lib-python", get_python_version())
- return os.path.join(prefix, 'site-packages')
-+ return os.path.join(prefix, 'lib', 'pypy%s.%s' % sys.pypy_version_info[:2])
-+ return os.path.join(prefix, 'lib', 'pypy%s.%s' % sys.pypy_version_info[:2], 'site-packages')
++ return os.path.join(prefix, 'lib', 'pypy-%s.%s' % sys.pypy_version_info[:2])
++ return os.path.join(prefix, 'lib', 'pypy-%s.%s' % sys.pypy_version_info[:2], 'site-packages')
_config_vars = None
Modified: head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
==============================================================================
--- head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -1,5 +1,5 @@
---- 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
+--- lib/pypy-2.1/lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200
++++ lib/pypy-2.1/lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200
@@ -270,7 +270,7 @@
_lib = _ffi.verify("""
Modified: head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
==============================================================================
--- head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -1,5 +1,5 @@
---- 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
+--- lib/pypy-2.1/lib_pypy/ctypes_config_cache/rebuild.py.orig 2013-04-08 15:26:29.000000000 +0200
++++ lib/pypy-2.1/lib_pypy/ctypes_config_cache/rebuild.py 2013-05-06 20:32:36.000000000 +0200
@@ -3,7 +3,7 @@
import os, sys
Modified: head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
==============================================================================
--- head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -1,5 +1,5 @@
---- 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
+--- lib/pypy-2.1/sysconfig.py.orig 2012-07-15 09:57:14.000000000 +0200
++++ lib/pypy-2.1/sysconfig.py 2012-07-15 10:03:25.000000000 +0200
@@ -27,12 +27,12 @@
'data' : '{base}',
},
@@ -10,12 +10,12 @@
- 'platlib': '{base}/lib-python/{py_version_short}',
- 'include': '{base}/include',
- 'platinclude': '{base}/include',
-+ 'stdlib': '{base}/lib/pypy{pypy_version_short}',
-+ 'platstdlib': '{platbase}/lib/pypy{pypy_version_short}',
-+ 'purelib': '{base}/lib/pypy{pypy_version_short}',
-+ 'platlib': '{platbase}/lib/pypy{pypy_version_short}',
-+ 'include': '{base}/include{pypy_version_short}',
-+ 'platinclude': '{platbase}/include/pypy{pypy_version_short}',
++ 'stdlib': '{base}/lib/pypy-{pypy_version_short}',
++ 'platstdlib': '{platbase}/lib/pypy-{pypy_version_short}',
++ 'purelib': '{base}/lib/pypy-{pypy_version_short}',
++ 'platlib': '{platbase}/lib/pypy-{pypy_version_short}',
++ 'include': '{base}/include-{pypy_version_short}',
++ 'platinclude': '{platbase}/include/pypy-{pypy_version_short}',
'scripts': '{base}/bin',
'data' : '{base}',
},
Modified: head/lang/pypy/files/patch-pypy__module__sys__initpath.py
==============================================================================
--- head/lang/pypy/files/patch-pypy__module__sys__initpath.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-pypy__module__sys__initpath.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -9,7 +9,7 @@
- CPYTHON_VERSION[1])
- lib_python = os.path.join(prefix, 'lib-python')
+ from pypy.module.sys.version import PYPY_VERSION
-+ dirname = 'pypy%d.%d' % PYPY_VERSION[:2]
++ dirname = 'pypy-%d.%d' % PYPY_VERSION[:2]
+ lib_python = os.path.join(prefix, 'lib')
python_std_lib = os.path.join(lib_python, dirname)
_checkdir(python_std_lib)
Modified: head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
==============================================================================
--- head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -11,7 +11,7 @@
import pypy
LIB_ROOT = os.path.dirname(os.path.dirname(pypy.__file__))
+LIB_ROOT = os.path.join(LIB_ROOT, 'lib')
-+LIB_ROOT = os.path.join(LIB_ROOT, 'pypy%d.%d' % PYPY_VERSION[:2])
++LIB_ROOT = os.path.join(LIB_ROOT, 'pypy-%d.%d' % PYPY_VERSION[:2])
class PyPySandboxedProc(VirtualizedSandboxedProc, SimpleIOSandboxedProc):
argv0 = '/bin/pypy-c'
@@ -24,7 +24,7 @@
- 'lib_pypy': RealDir(os.path.join(libroot, 'lib_pypy'),
- exclude=exclude),
+ 'lib': Dir({
-+ 'pypy%d.%d' % PYPY_VERSION[:2] : RealDir(libroot,
++ 'pypy-%d.%d' % PYPY_VERSION[:2] : RealDir(libroot,
+ exclude=exclude)
+ })
}),
Modified: head/lang/pypy/files/patch-pypy__tool__lib_pypy.py
==============================================================================
--- head/lang/pypy/files/patch-pypy__tool__lib_pypy.py Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/patch-pypy__tool__lib_pypy.py Sat Aug 3 16:18:49 2013 (r324198)
@@ -11,7 +11,7 @@
-LIB_PYPY = LIB_ROOT.join('lib_pypy')
-LIB_PYTHON = LIB_ROOT.join('lib-python', '%d.%d' % CPYTHON_VERSION[:2])
-
-+LIB_PYTHON = LIB_ROOT.join('lib', 'pypy%d.%d' % PYPY_VERSION[:2])
++LIB_PYTHON = LIB_ROOT.join('lib', 'pypy-%d.%d' % PYPY_VERSION[:2])
+LIB_PYPY = LIB_PYTHON.join('lib_pypy')
def import_from_lib_pypy(modname):
Modified: head/lang/pypy/files/use.pypy
==============================================================================
--- head/lang/pypy/files/use.pypy Sat Aug 3 16:17:05 2013 (r324197)
+++ head/lang/pypy/files/use.pypy Sat Aug 3 16:18:49 2013 (r324198)
@@ -12,13 +12,13 @@ then
do
if [ ! -L $PREFIX/bin/$name ]
then
- ln -s $name$PYPY_VER $PREFIX/bin/$name
+ ln -s $name-$PYPY_VER $PREFIX/bin/$name
fi
done
elif [ "$2" = "POST-DEINSTALL" ] ; then
for name in $PYPY_NAMES
do
- if [ -L $PREFIX/bin/$name ] && [ `readlink $PREFIX/bin/$name` = $name$PYPY_VER ]
+ if [ -L $PREFIX/bin/$name ] && [ `readlink $PREFIX/bin/$name` = $name-$PYPY_VER ]
then
rm $PREFIX/bin/$name
fi
More information about the svn-ports-all
mailing list