Date: Wed, 3 Jan 2018 18:42:15 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457998 - in head: databases/pypy-gdbm databases/pypy-sqlite3 lang/pypy lang/pypy/files lang/pypy3 lang/pypy3/files x11-toolkits/pypy-tkinter Message-ID: <201801031842.w03IgFZo012436@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Wed Jan 3 18:42:15 2018 New Revision: 457998 URL: https://svnweb.freebsd.org/changeset/ports/457998 Log: lang/pypy(3): update to 5.10, add flavors to ancillary ports - Consistently use DISTVERSION instead of PORTVERSION (the former is set, not the latter) - Only depend on libunwind on x86 arch with FreeBSD >= 11 (fixes ignored build on arm/ppc) - Fix python dependency with depreciation of python meta ports - Remove PYPY_BITS from pkg-plist target, no longer used - Remove setting of PORTVERSION, DISTVERSION is set in bsd.pypy.mk - bsd.pypy.mk: - Define DISTVERSION once, to ensure consistency - PYPY_DIR: Handle versions with multiple digits - PYPY_CFFI_VER now differs in value between pypy and pypy3 - bsd.pypy.cffi.mk: - Add FLAVORS for pypy and pypy3 [1] - Consistently use PYTHON_IMPL instead of the hard coded "pypy" - PLIST_FILES: use direct substitution instead of PLIST_SUB Approved by: portmgr (mat) [1] Differential Revision: https://reviews.freebsd.org/D13675 Deleted: head/lang/pypy/files/patch-lib-python_2.7_ctypes_____init____.py head/lang/pypy/files/patch-pypy_module___rawffi_alt_interp__funcptr.py head/lang/pypy/files/patch-pypy_module___vmprof_test_test____vmprof.py head/lang/pypy/files/patch-pypy_module_termios_test_test__termios.py head/lang/pypy/files/patch-pypy_module_test__lib__pypy_cffi__tests_cffi1_test__recompiler.py head/lang/pypy/files/patch-pypy_module_test__lib__pypy_pyrepl_____init____.py head/lang/pypy/files/patch-pypy_module_test__lib__pypy_pyrepl_test__readline.py head/lang/pypy/files/patch-pypy_tool_cpyext_extbuild.py head/lang/pypy/files/patch-rpython_rlib_libffi.py head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_machine.c head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmp__stack.c head/lang/pypy/files/patch-rpython_rtyper_lltypesystem_ll2ctypes.py head/lang/pypy3/files/patch-lib-python_2.7_ctypes_____init____.py head/lang/pypy3/files/patch-lib-python_3_ctypes_____init____.py head/lang/pypy3/files/patch-lib__pypy___curses__build.py head/lang/pypy3/files/patch-pypy_module___rawffi_alt_interp__funcptr.py head/lang/pypy3/files/patch-pypy_module___vmprof_test_test____vmprof.py head/lang/pypy3/files/patch-pypy_module_termios_test_test__termios.py head/lang/pypy3/files/patch-pypy_module_test__lib__pypy_cffi__tests_cffi1_test__recompiler.py head/lang/pypy3/files/patch-pypy_module_test__lib__pypy_pyrepl_____init____.py head/lang/pypy3/files/patch-pypy_module_test__lib__pypy_pyrepl_test__readline.py head/lang/pypy3/files/patch-pypy_tool_cpyext_extbuild.py head/lang/pypy3/files/patch-rpython_rlib_libffi.py head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_machine.c head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmp__stack.c head/lang/pypy3/files/patch-rpython_rtyper_lltypesystem_ll2ctypes.py Modified: head/databases/pypy-gdbm/Makefile head/databases/pypy-sqlite3/Makefile head/lang/pypy/Makefile head/lang/pypy/bsd.pypy.cffi.mk head/lang/pypy/bsd.pypy.mk head/lang/pypy/distinfo head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py head/lang/pypy3/distinfo head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py head/lang/pypy3/pkg-plist head/x11-toolkits/pypy-tkinter/Makefile Modified: head/databases/pypy-gdbm/Makefile ============================================================================== --- head/databases/pypy-gdbm/Makefile Wed Jan 3 18:38:41 2018 (r457997) +++ head/databases/pypy-gdbm/Makefile Wed Jan 3 18:42:15 2018 (r457998) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= gdbm -PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= databases python MAINTAINER= python@FreeBSD.org Modified: head/databases/pypy-sqlite3/Makefile ============================================================================== --- head/databases/pypy-sqlite3/Makefile Wed Jan 3 18:38:41 2018 (r457997) +++ head/databases/pypy-sqlite3/Makefile Wed Jan 3 18:42:15 2018 (r457998) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= sqlite3 -PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= databases python MAINTAINER= python@FreeBSD.org Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy/Makefile Wed Jan 3 18:42:15 2018 (r457998) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME?= pypy -DISTVERSION?= 5.9.0 # Also update bsd.pypy.cffi.mk CATEGORIES= lang python MASTER_SITES= https://bitbucket.org/pypy/pypy/downloads/ http://buildbot.pypy.org/mirror/ -DISTNAME?= ${PORTNAME}2-v${PORTVERSION}-src +DISTNAME?= ${PORTNAME}2-v${DISTVERSION}-src MAINTAINER= python@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language @@ -15,8 +14,7 @@ LICENSE_COMB= multi LICENSE_FILE_MIT= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 \ - libffi.so:devel/libffi \ - libunwind.so:devel/libunwind + libffi.so:devel/libffi TEST_DEPENDS= ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \ ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \ ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter @@ -47,7 +45,7 @@ OPTIONS_SLAVE= PYTHON .endif ALL_TARGET= ${PORTNAME}-c -BUILD_WRKSRC?= ${WRKDIR}/build/usession-release-pypy2.7-v${PORTVERSION}-0/testing_1 +BUILD_WRKSRC?= ${WRKDIR}/build/usession-release-pypy2.7-v${DISTVERSION}-0/testing_1 MAKE_ENV+= PYPY_LOCALBASE=${LOCALBASE} LDSHARED="${CC} -shared" PACKAGE_ARGS?= --without-gdbm --without-sqlite3 --without-tk USE_LDCONFIG= ${PREFIX}/${PYPY_DIR}/bin @@ -95,7 +93,7 @@ PYPY_MINMEM_BUILD_DEPENDS= pypy:lang/pypy 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_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR} -PYTHON_USES= python:2,build +PYTHON_USES= python:2.7,build DESCR= ${.CURDIR}/pkg-descr DISTINFO_FILE= ${.CURDIR}/distinfo @@ -106,8 +104,10 @@ PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/bsd.pypy.mk" .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1100000 || (${ARCH} != i386 && ${ARCH} != amd64)) PYPY_ARGS= --withoutmod-_vmprof +.else +LIB_DEPENDS+= libunwind.so:devel/libunwind .endif post-extract: @@ -154,7 +154,6 @@ do-test: pkg-plist: stage ${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen ${REINPLACE_CMD} -e 's|^${PYPY_DIR}|%%PYPY_DIR%%|g' \ - -e 's|_${PYPY_BITS}_|_%%PYPY_BITS%%_|g' \ -e 's|${PYPY_CFFI_VER}|%%PYPY_CFFI_VER%%|g' \ -e 's/\(.*\/__pycache__\)\/$$/@dir \1/g' \ -e '/\/$$/d' \ Modified: head/lang/pypy/bsd.pypy.cffi.mk ============================================================================== --- head/lang/pypy/bsd.pypy.cffi.mk Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy/bsd.pypy.cffi.mk Wed Jan 3 18:42:15 2018 (r457998) @@ -3,16 +3,19 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= -BUILD_DEPENDS+= pypy:lang/pypy -RUN_DEPENDS+= pypy:lang/pypy +BUILD_DEPENDS+= ${PYTHON_IMPL}:lang/${PYTHON_IMPL} +RUN_DEPENDS+= ${PYTHON_IMPL}:lang/${PYTHON_IMPL} -PLIST_FILES= %%PYPY_DIR%%/lib_pypy/${CFFI_MODULE}_cffi.%%PYPY_CFFI_VER%%.so +PLIST_FILES= ${PYPY_DIR}/lib_pypy/${CFFI_MODULE}_cffi.${PYPY_CFFI_VER}.so CFFI_MODULE?= _${PORTNAME} -PYTHON_IMPL= pypy -PYTHON_PORTVERSION?= 5.9.0 -PYTHON_PKGNAMEPREFIX= pypy- +FLAVORS= pypy pypy3 +FLAVOR?= ${FLAVORS:[1]} + +PYTHON_IMPL= ${FLAVOR} +PYTHON_PORTVERSION= ${DISTVERSION} +PYTHON_PKGNAMEPREFIX= ${PYTHON_IMPL}- PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_IMPL} .include "${.CURDIR}/../../lang/pypy/bsd.pypy.mk" Modified: head/lang/pypy/bsd.pypy.mk ============================================================================== --- head/lang/pypy/bsd.pypy.mk Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy/bsd.pypy.mk Wed Jan 3 18:42:15 2018 (r457998) @@ -1,5 +1,7 @@ # $FreeBSD$ +DISTVERSION= 5.10.0 + .if !defined(LICENSE) LICENSE= MIT PSFL LICENSE_COMB= multi @@ -8,6 +10,11 @@ LICENSE_COMB= multi USES+= compiler:c11 PYTHON_IMPL?= ${PORTNAME} -PYPY_DIR= ${PYTHON_IMPL}-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} -PYPY_CFFI_VER?= pypy-41 +PYPY_DIR= ${PYTHON_IMPL}-${DISTVERSION:C|([0-9])\.([0-9]+).*|\1.\2|} PLIST_SUB+= PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER} + +.if ${PYTHON_IMPL} == pypy +PYPY_CFFI_VER= ${PYTHON_IMPL}-41 +.else # ${PYTHON_IMPL} == pypy3 +PYPY_CFFI_VER= ${PYTHON_IMPL}-${DISTVERSION:S|.||:C|\..*||}-${OPSYS:tl}${OSREL:C|\..*||} +.endif Modified: head/lang/pypy/distinfo ============================================================================== --- head/lang/pypy/distinfo Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy/distinfo Wed Jan 3 18:42:15 2018 (r457998) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509042816 -SHA256 (pypy2-v5.9.0-src.tar.bz2) = de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 -SIZE (pypy2-v5.9.0-src.tar.bz2) = 19175394 +TIMESTAMP = 1514290464 +SHA256 (pypy2-v5.10.0-src.tar.bz2) = 1209f2db718e6afda17528baa5138177a14a0938588a7d3e1b7c722c483079a8 +SIZE (pypy2-v5.10.0-src.tar.bz2) = 19181430 Modified: head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py ============================================================================== --- head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py Wed Jan 3 18:42:15 2018 (r457998) @@ -1,14 +1,11 @@ ---- rpython/rlib/rvmprof/cintf.py.orig 2017-10-03 10:49:20 UTC +--- rpython/rlib/rvmprof/cintf.py.orig 2017-12-27 19:18:35 UTC +++ rpython/rlib/rvmprof/cintf.py -@@ -47,7 +47,10 @@ else: - # Guessing a BSD-like Unix platform - compile_extra += ['-DVMPROF_UNIX'] - compile_extra += ['-DVMPROF_MAC'] -- _libs = [] -+ if sys.platform.startswith('freebsd'): -+ _libs = ['unwind'] -+ else: -+ _libs = [] +@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio + # vmprof works only on x86 for now + IS_SUPPORTED = detect_cpu.autodetect().startswith('x86') +-if sys.platform == 'win32': ++if sys.platform in ('freebsd10', 'win32'): + IS_SUPPORTED = False - eci_kwds = dict( + ROOT = py.path.local(rpythonroot).join('rpython', 'rlib', 'rvmprof') Modified: head/lang/pypy3/distinfo ============================================================================== --- head/lang/pypy3/distinfo Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy3/distinfo Wed Jan 3 18:42:15 2018 (r457998) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509472928 -SHA256 (pypy3-v5.9.0-src.tar.bz2) = a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 -SIZE (pypy3-v5.9.0-src.tar.bz2) = 29055111 +TIMESTAMP = 1514299345 +SHA256 (pypy3-v5.10.0-src.tar.bz2) = a6e4cffde71e3f08b6e1befa5c0352a9bcc5f4e9f5cbf395001e0763a1a0d9e3 +SIZE (pypy3-v5.10.0-src.tar.bz2) = 29075971 Modified: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py ============================================================================== --- head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py Wed Jan 3 18:42:15 2018 (r457998) @@ -1,14 +1,11 @@ ---- rpython/rlib/rvmprof/cintf.py.orig 2017-10-03 10:53:54 UTC +--- rpython/rlib/rvmprof/cintf.py.orig 2017-12-22 10:09:25 UTC +++ rpython/rlib/rvmprof/cintf.py -@@ -47,7 +47,10 @@ else: - # Guessing a BSD-like Unix platform - compile_extra += ['-DVMPROF_UNIX'] - compile_extra += ['-DVMPROF_MAC'] -- _libs = [] -+ if sys.platform.startswith('freebsd'): -+ _libs = ['unwind'] -+ else: -+ _libs = [] +@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio + # vmprof works only on x86 for now + IS_SUPPORTED = detect_cpu.autodetect().startswith('x86') +-if sys.platform == 'win32': ++if sys.platform in ('freebsd10', 'win32'): + IS_SUPPORTED = False - eci_kwds = dict( + ROOT = py.path.local(rpythonroot).join('rpython', 'rlib', 'rvmprof') Modified: head/lang/pypy3/pkg-plist ============================================================================== --- head/lang/pypy3/pkg-plist Wed Jan 3 18:38:41 2018 (r457997) +++ head/lang/pypy3/pkg-plist Wed Jan 3 18:42:15 2018 (r457998) @@ -2106,6 +2106,7 @@ bin/pypy3 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/error.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/errorcodes.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/utility.py +%%PYPY_DIR%%/lib_pypy/_cffi_ssl/osx-roots.diff %%PYPY_DIR%%/lib_pypy/_cffi_ssl/tools/make_ssl_data.py %%PYPY_DIR%%/lib_pypy/_codecs_cn.py %%PYPY_DIR%%/lib_pypy/_codecs_hk.py @@ -2268,6 +2269,7 @@ bin/pypy3 %%PYPY_DIR%%/lib_pypy/cffi/verifier.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/.empty %%PYPY_DIR%%/lib_pypy/ctypes_support.py +%%PYPY_DIR%%/lib_pypy/faulthandler.py %%PYPY_DIR%%/lib_pypy/future_builtins.py %%PYPY_DIR%%/lib_pypy/greenlet.egg-info %%PYPY_DIR%%/lib_pypy/greenlet.py @@ -2311,16 +2313,19 @@ bin/pypy3 %%PYPY_DIR%%/site-packages/README @dir %%PYPY_DIR%%/lib-python/3/__pycache__ @dir %%PYPY_DIR%%/lib-python/3/collections/__pycache__ +@dir %%PYPY_DIR%%/lib-python/3/curses/__pycache__ @dir %%PYPY_DIR%%/lib-python/3/distutils/__pycache__ @dir %%PYPY_DIR%%/lib-python/3/distutils/command/__pycache__ @dir %%PYPY_DIR%%/lib-python/3/email/__pycache__ @dir %%PYPY_DIR%%/lib-python/3/encodings/__pycache__ +@dir %%PYPY_DIR%%/lib-python/3/ensurepip/__pycache__ @dir %%PYPY_DIR%%/lib-python/3/importlib/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/_hashlib/__pycache__ +@dir %%PYPY_DIR%%/lib_pypy/_ssl/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/cffi/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/__pycache__ @dir %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/ply/__pycache__ Modified: head/x11-toolkits/pypy-tkinter/Makefile ============================================================================== --- head/x11-toolkits/pypy-tkinter/Makefile Wed Jan 3 18:38:41 2018 (r457997) +++ head/x11-toolkits/pypy-tkinter/Makefile Wed Jan 3 18:42:15 2018 (r457998) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= tkinter -PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= x11-toolkits python MAINTAINER= python@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801031842.w03IgFZo012436>