From owner-svn-ports-head@FreeBSD.ORG Sat Nov 16 15:16:17 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2422235; Sat, 16 Nov 2013 15:16:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A09BC25AF; Sat, 16 Nov 2013 15:16:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGFGHim051791; Sat, 16 Nov 2013 15:16:17 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGFGGlQ051787; Sat, 16 Nov 2013 15:16:16 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201311161516.rAGFGGlQ051787@svn.freebsd.org> From: David Naylor Date: Sat, 16 Nov 2013 15:16:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334004 - in head/lang/pypy-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 15:16:17 -0000 Author: dbn Date: Sat Nov 16 15:16:16 2013 New Revision: 334004 URL: http://svnweb.freebsd.org/changeset/ports/334004 Log: Update lang/pypy-devel to 2.2 (for wider testing). Changes: * Strip cffi libraries Outstanding items: * Fix virtualenv bug (ports/183795) * Update memory and compiler times (Makefile, wiki) ChangeLog: * Our Garbage Collector is now "incremental". It should avoid almost all pauses due to a major collection taking place. Previously, it would pause the program (rarely) to walk all live objects, which could take arbitrarily long if your process is using a whole lot of RAM. Now the same work is done in steps. This should make PyPy more responsive, e.g. in games. There are still other pauses, from the GC and the JIT, but they should be on the order of 5 milliseconds each. * The JIT counters for hot code were never reset, which meant that a process running for long enough would eventually JIT-compile more and more rarely executed code. Not only is it useless to compile such code, but as more compiled code means more memory used, this gives the impression of a memory leak. This has been tentatively fixed by decreasing the counters from time to time. * NumPy has been split: now PyPy only contains the core module, called _numpypy. The numpy module itself has been moved to https://bitbucket.org/pypy/numpy and numpypy disappeared. You need to install NumPy separately with a virtualenv: pip install git+https://bitbucket.org/pypy/numpy.git; or directly: git clone https://bitbucket.org/pypy/numpy.git; cd numpy; pypy setup.py install. * non-inlined calls have less overhead * Things that use sys.set_trace are now JITted (like coverage) * JSON decoding is now very fast (JSON encoding was already very fast) * various buffer copying methods experience speedups (like list-of-ints to int[] buffer from cffi) * We finally wrote (hopefully) all the missing os.xxx() functions, including os.startfile() on Windows and a handful of rare ones on Posix. * numpy has a rudimentary C API that cooperates with cpyext Modified: head/lang/pypy-devel/Makefile head/lang/pypy-devel/distinfo head/lang/pypy-devel/files/Makefile head/lang/pypy-devel/pkg-plist Modified: head/lang/pypy-devel/Makefile ============================================================================== --- head/lang/pypy-devel/Makefile Sat Nov 16 14:56:03 2013 (r334003) +++ head/lang/pypy-devel/Makefile Sat Nov 16 15:16:16 2013 (r334004) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= pypy -DISTVERSION= 2.2-alpha${DATE} -CATEGORIES= lang python java -MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/${PORTNAME} +DISTVERSION= 2.2 +CATEGORIES= lang python +MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/ https://bitbucket.org/pypy/pypy/downloads/ PKGNAMESUFFIX= -devel -DISTNAME= ${COMMIT} -DIST_SUBDIR= pypy +DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= dbn@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language @@ -41,14 +40,12 @@ LATEST_LINK= ${PORTNAME}-devel ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR} -COMMIT= ab7580454b32 DATE= 20130810 USE_BZIP2= yes USES= compiler:c11 gettext iconv MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -WRKSRC= ${WRKDIR}/pypy-pypy-${COMMIT} PYPY_VER= ${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} PYTHON_IMPL_VER= 2.7 @@ -251,6 +248,7 @@ post-build: .for mod in _sqlite3 _curses syslog ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}' .endfor + ${STRIP_CMD} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/__pycache__/_cffi__*.pypy-${PYPY_VER:C/\.//}.so .for _path in ${PYPYDIRS} -${FIND} ${WRKDIR}/${_path:C/.*://}/ -type d | \ ${XARGS} -n1 ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl Modified: head/lang/pypy-devel/distinfo ============================================================================== --- head/lang/pypy-devel/distinfo Sat Nov 16 14:56:03 2013 (r334003) +++ head/lang/pypy-devel/distinfo Sat Nov 16 15:16:16 2013 (r334004) @@ -1,2 +1,2 @@ -SHA256 (pypy/ab7580454b32.tar.bz2) = 2028ee188895490a0df3e6968ce83a78e1a7188f72f51e193d0d7646d9a611fe -SIZE (pypy/ab7580454b32.tar.bz2) = 14240611 +SHA256 (pypy-2.2-src.tar.bz2) = 50fffcb86039e019530a63d656580bc53c173e5f19768bddd8699cd08448e04e +SIZE (pypy-2.2-src.tar.bz2) = 14276850 Modified: head/lang/pypy-devel/files/Makefile ============================================================================== --- head/lang/pypy-devel/files/Makefile Sat Nov 16 14:56:03 2013 (r334003) +++ head/lang/pypy-devel/files/Makefile Sat Nov 16 15:16:16 2013 (r334004) @@ -21,7 +21,7 @@ TOUCH?= touch REINPLACE_CMD?= ${SED} -i~ -BUILDDIR= usession-default-0 +BUILDDIR= usession-release-${DISTVERSION}.x-0 .for inst in ${PYPY_INST} Modified: head/lang/pypy-devel/pkg-plist ============================================================================== --- head/lang/pypy-devel/pkg-plist Sat Nov 16 14:56:03 2013 (r334003) +++ head/lang/pypy-devel/pkg-plist Sat Nov 16 15:16:16 2013 (r334004) @@ -21,7 +21,11 @@ %%PYPY_INCLUDEDIR%%/listobject.h %%PYPY_INCLUDEDIR%%/longintrepr.h %%PYPY_INCLUDEDIR%%/methodobject.h +%%PYPY_INCLUDEDIR%%/missing.h %%PYPY_INCLUDEDIR%%/modsupport.h +%%PYPY_INCLUDEDIR%%/numpy/arrayobject.h +%%PYPY_INCLUDEDIR%%/numpy/npy_3kcompat.h +%%PYPY_INCLUDEDIR%%/numpy/old_defines.h %%PYPY_INCLUDEDIR%%/object.h %%PYPY_INCLUDEDIR%%/patchlevel.h %%PYPY_INCLUDEDIR%%/pycapsule.h @@ -1450,9 +1454,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__g3b3d68b9x310af836.pypy-%%PYPY_VER%%.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g7019d5d3xad93c709.pypy-%%PYPY_VER%%.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g774d129dx1fd01a91.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3e8f69b6x1fd01a91.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g45f34413x310af836.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__ga01735dbxad93c709.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py @@ -1590,6 +1594,8 @@ %%PYPY_LIBDIR%%/lib_pypy/cffi/ffiplatform.pyc %%PYPY_LIBDIR%%/lib_pypy/cffi/gc_weakref.py %%PYPY_LIBDIR%%/lib_pypy/cffi/gc_weakref.pyc +%%PYPY_LIBDIR%%/lib_pypy/cffi/lock.py +%%PYPY_LIBDIR%%/lib_pypy/cffi/lock.pyc %%PYPY_LIBDIR%%/lib_pypy/cffi/model.py %%PYPY_LIBDIR%%/lib_pypy/cffi/model.pyc %%PYPY_LIBDIR%%/lib_pypy/cffi/vengine_cpy.py @@ -1637,36 +1643,6 @@ %%PYPY_LIBDIR%%/lib_pypy/marshal.pyc %%PYPY_LIBDIR%%/lib_pypy/msvcrt.py %%PYPY_LIBDIR%%/lib_pypy/msvcrt.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpy.py -%%PYPY_LIBDIR%%/lib_pypy/numpy.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/__init__.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/__init__.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/__init__.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/__init__.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/_methods.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/_methods.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/arrayprint.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/arrayprint.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/fromnumeric.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/fromnumeric.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/multiarray.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/multiarray.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numeric.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numeric.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numerictypes.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numerictypes.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/shape_base.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/shape_base.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/umath.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/umath.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/__init__.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/__init__.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/function_base.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/function_base.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/shape_base.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/shape_base.pyc -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/twodim_base.py -%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/twodim_base.pyc %%PYPY_LIBDIR%%/lib_pypy/pwd.py %%PYPY_LIBDIR%%/lib_pypy/pwd.pyc %%PYPY_LIBDIR%%/lib_pypy/pyrepl/__init__.py @@ -3788,9 +3764,6 @@ @dirrm %%PYPY_LIBDIR%%/msilib @dirrm %%PYPY_LIBDIR%%/logging @dirrm %%PYPY_LIBDIR%%/lib_pypy/pyrepl -@dirrm %%PYPY_LIBDIR%%/lib_pypy/numpypy/lib -@dirrm %%PYPY_LIBDIR%%/lib_pypy/numpypy/core -@dirrm %%PYPY_LIBDIR%%/lib_pypy/numpypy @dirrm %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache @dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/ply @dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser @@ -3832,4 +3805,5 @@ @dirrm %%PYPY_LIBDIR%%/bsddb/test @dirrm %%PYPY_LIBDIR%%/bsddb @dirrmtry %%PYPY_LIBDIR%% +@dirrm %%PYPY_INCLUDEDIR%%/numpy @dirrmtry %%PYPY_INCLUDEDIR%%