Index: head/lang/pypy/Makefile =================================================================== --- head/lang/pypy/Makefile (revision 475488) +++ head/lang/pypy/Makefile (revision 475489) @@ -1,166 +1,166 @@ # Created by: David Naylor # $FreeBSD$ PORTNAME?= pypy CATEGORIES= lang python MASTER_SITES= https://bitbucket.org/pypy/pypy/downloads/ http://buildbot.pypy.org/mirror/ DISTNAME?= ${PORTNAME}2-v${DISTVERSION}-src MAINTAINER= python@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language LICENSE= MIT PSFL LICENSE_COMB= multi LICENSE_FILE_MIT= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 \ 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 ONLY_FOR_ARCHS?= amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON?= PyPy JIT only supported on these architectures BROKEN_armv6= fails to package: pypy_objspace_std.c: Crash in JIT! BROKEN_armv7= fails to package: pypy_objspace_std.c: Crash in JIT! BROKEN_powerpc64= fails to compile: platcheck_109.c: fatal error: linux/auxvec.h: No such file or directory OPTIONS_SINGLE= TRANS OPTIONS_SINGLE_TRANS= PYTHON PYTHON_DESC= Use Python-2.7 to translate (slowest) PYPY_DESC= Use PyPy to translate (fastest, highest memory usage) PYPY_MINMEM_DESC= Use PyPy to translate (lowest memory usage) TRANS_DESC= Translation method LOCALBASE?= /usr/local .if exists(${LOCALBASE}/bin/pypy) || ${PORTNAME} != pypy OPTIONS_SINGLE_TRANS+= PYPY PYPY_MINMEM . if exists(${LOCALBASE}/bin/pypy) OPTIONS_DEFAULT= PYPY_MINMEM . else OPTIONS_DEFAULT= PYTHON . endif .else OPTIONS_SLAVE= PYTHON .endif ALL_TARGET= ${PORTNAME}-c 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 LLD_UNSAFE= yes USES= gettext-runtime gmake shebangfix ssl tar:bzip2 SHEBANG_FILES?= lib-python/2.7/plat-mac/appletrunner.py \ lib-python/2.7/plat-mac/bundlebuilder.py \ lib-python/2.7/keyword.py \ lib-python/2.7/test/regrtest.py \ lib-python/2.7/test/pystone.py \ lib-python/2.7/test/curses_tests.py \ lib-python/2.7/test/re_tests.py \ lib-python/2.7/test/crashers/recursive_call.py \ lib-python/2.7/UserString.py \ lib-python/2.7/pdb.py \ lib-python/2.7/mimify.py \ lib-python/2.7/pydoc.py \ lib-python/2.7/uu.py \ lib-python/2.7/trace.py \ lib-python/2.7/platform.py \ lib-python/2.7/profile.py \ lib-python/2.7/tabnanny.py \ lib-python/2.7/lib2to3/tests/pytree_idempotency.py \ lib-python/2.7/lib2to3/tests/data/false_encoding.py \ lib-python/2.7/lib2to3/tests/data/different_encoding.py \ lib-python/2.7/lib2to3/pgen2/token.py \ lib-python/2.7/encodings/rot_13.py \ lib-python/2.7/base64.py \ lib-python/2.7/webbrowser.py \ lib-python/2.7/idlelib/PyShell.py \ lib-python/2.7/cgi.py \ lib-python/2.7/symbol.py \ lib-python/2.7/cProfile.py \ lib-python/2.7/smtpd.py \ lib-python/2.7/quopri.py \ lib-python/2.7/timeit.py \ lib-python/2.7/smtplib.py python_OLD_CMD= /usr/local/bin/python python_CMD= ${PREFIX}/bin/${PORTNAME} .if ${PORTNAME} != pypy PYPY_BUILD_DEPENDS= pypy:lang/pypy PYPY_MINMEM_BUILD_DEPENDS= pypy:lang/pypy .endif 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.7,build DESCR= ${.CURDIR}/pkg-descr DISTINFO_FILE= ${.CURDIR}/distinfo MASTERDIR?= ${.CURDIR} PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/bsd.pypy.mk" .include -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1100000 || (${ARCH} != i386 && ${ARCH} != amd64)) +.if ${OPSYS} == FreeBSD && ${ARCH} != i386 && ${ARCH} != amd64 PYPY_ARGS= --withoutmod-_vmprof .else LIB_DEPENDS+= libunwind.so:devel/libunwind .endif post-extract: ${FIND} ${WRKSRC} -name '*.swn' -delete pre-build: if [ ! -f ${BUILD_WRKSRC}/Makefile ]; then \ ${RM} -r ${WRKDIR}/build; \ ${MKDIR} ${WRKDIR}/build; \ (cd ${WRKSRC}/pypy/goal; \ ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \ ${PYTHON_CMD} ../../rpython/bin/rpython --source -Ojit targetpypystandalone.py ${PYPY_ARGS}); \ fi post-build: ${CP} ${BUILD_WRKSRC}/${PORTNAME}-c ${BUILD_WRKSRC}/lib${PORTNAME}-c.so ${WRKSRC}/pypy/goal/ do-install: ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \ ${PYTHON_CMD} ${WRKSRC}/pypy/tool/release/package.py --builddir ${WRKDIR}/build --archive-name ${PYPY_DIR} \ ${PACKAGE_ARGS} ${EXTRACT_CMD} -C ${STAGEDIR}${PREFIX} -xf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 ${LN} -fs ../${PYPY_DIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${FIND} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/lib_pypy/ -name '*.so' | ${XARGS} ${STRIP_CMD} do-test: # See https://bitbucket.org/pypy/buildbot/src/default/bot2/pypybuildbot/builds.py?at=default#builds.py-386 # add_translated_tests() (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \ ${WRKSRC}/pypy/goal/pypy-c testrunner/runner.py --root pypy --logfile=pytest-A.log \ --parallel-runs ${MAKE_JOBS_NUMBER} \ --config pypy/pytest-A.cfg --config pypy/pytest-A.py) .for dir in lib-python pypy/module/pypyjit/test (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \ ${WRKSRC}/pypy/goal/pypy-c pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/pypy-c \ ${dir} ) .endfor (cd ${WRKSRC}/lib-python/2.7/test; \ ${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \ ${WRKSRC}/pypy/goal/pypy-c regrtest.py -vvu all) 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_CFFI_VER}|%%PYPY_CFFI_VER%%|g' \ -e 's/\(.*\/__pycache__\)\/$$/@dir \1/g' \ -e '/\/$$/d' \ ${WRKDIR}/.plist-files-gen ${ECHO} bin/${PORTNAME} > ${WRKDIR}/pkg-plist ${SORT} ${WRKDIR}/.plist-files-gen | ${GREP} -v '\.orig' >> ${WRKDIR}/pkg-plist ${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist .include Index: head/lang/pypy/bsd.pypy.mk =================================================================== --- head/lang/pypy/bsd.pypy.mk (revision 475488) +++ head/lang/pypy/bsd.pypy.mk (revision 475489) @@ -1,20 +1,22 @@ # $FreeBSD$ .if !defined(LICENSE) LICENSE= MIT PSFL LICENSE_COMB= multi .endif USES+= compiler:c11 PYTHON_IMPL?= ${PORTNAME} 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 DISTVERSION= 6.0.0 +PORTREVISION= 1 PYPY_CFFI_VER= ${PYTHON_IMPL}-41 .else # ${PYTHON_IMPL} == pypy3 DISTVERSION= 6.0.0 +PORTREVISION= 1 PYPY_CFFI_VER= ${PYTHON_IMPL}-${DISTVERSION:S|.||:C|\..*||}-${OPSYS:tl}${OSREL:C|\..*||} .endif Index: head/lang/pypy/files/patch-pypy_config_pypyoption.py =================================================================== --- head/lang/pypy/files/patch-pypy_config_pypyoption.py (revision 475488) +++ head/lang/pypy/files/patch-pypy_config_pypyoption.py (nonexistent) @@ -1,11 +0,0 @@ ---- pypy/config/pypyoption.py.orig 2018-07-04 08:38:58 UTC -+++ pypy/config/pypyoption.py -@@ -42,7 +42,7 @@ working_modules.update([ - from rpython.jit.backend import detect_cpu - try: - if detect_cpu.autodetect().startswith('x86'): -- if not sys.platform.startswith('openbsd'): -+ if not (sys.platform.startswith('openbsd') or sys.platform.startswith('freebsd')): - working_modules.add('_vmprof') - working_modules.add('faulthandler') - except detect_cpu.ProcessorAutodetectError: Property changes on: head/lang/pypy/files/patch-pypy_config_pypyoption.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py =================================================================== --- head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py (nonexistent) +++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py (revision 475489) @@ -0,0 +1,11 @@ +--- rpython/rlib/rvmprof/cintf.py.orig 2018-04-24 06:04:29 UTC ++++ rpython/rlib/rvmprof/cintf.py +@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio + + # vmprof works only on x86 for now + IS_SUPPORTED = False +-if sys.platform in ('darwin', 'linux', 'linux2'): ++if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'): + try: + IS_SUPPORTED = detect_cpu.autodetect().startswith('x86') + except detect_cpu.ProcessorAutodetectError: Property changes on: head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h =================================================================== --- head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h (nonexistent) +++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h (revision 475489) @@ -0,0 +1,12 @@ +--- rpython/rlib/rvmprof/src/shared/vmprof_unix.h.orig 2018-07-19 09:03:21 UTC ++++ rpython/rlib/rvmprof/src/shared/vmprof_unix.h +@@ -24,6 +24,9 @@ + + #include "vmprof_mt.h" + ++#ifdef __FreeBSD__ ++#include ++#endif + #include + + RPY_EXTERN void vmprof_ignore_signals(int ignored); Property changes on: head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/pypy3/files/patch-pypy_config_pypyoption.py =================================================================== --- head/lang/pypy3/files/patch-pypy_config_pypyoption.py (revision 475488) +++ head/lang/pypy3/files/patch-pypy_config_pypyoption.py (nonexistent) @@ -1,11 +0,0 @@ ---- pypy/config/pypyoption.py.orig 2018-07-04 10:31:39 UTC -+++ pypy/config/pypyoption.py -@@ -46,7 +46,7 @@ working_modules.update([ - from rpython.jit.backend import detect_cpu - try: - if detect_cpu.autodetect().startswith('x86'): -- if not sys.platform.startswith('openbsd'): -+ if not (sys.platform.startswith('openbsd') or sys.platform.startswith('freebsd')): - working_modules.add('_vmprof') - working_modules.add('faulthandler') - except detect_cpu.ProcessorAutodetectError: Property changes on: head/lang/pypy3/files/patch-pypy_config_pypyoption.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py =================================================================== --- head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py (nonexistent) +++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py (revision 475489) @@ -0,0 +1,11 @@ +--- rpython/rlib/rvmprof/cintf.py.orig 2018-04-24 06:04:29 UTC ++++ rpython/rlib/rvmprof/cintf.py +@@ -17,7 +17,7 @@ class VMProfPlatformUnsupported(Exceptio + + # vmprof works only on x86 for now + IS_SUPPORTED = False +-if sys.platform in ('darwin', 'linux', 'linux2'): ++if sys.platform in ('darwin', 'linux', 'linux2') or sys.platform.startswith('freebsd'): + try: + IS_SUPPORTED = detect_cpu.autodetect().startswith('x86') + except detect_cpu.ProcessorAutodetectError: Property changes on: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h =================================================================== --- head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h (nonexistent) +++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h (revision 475489) @@ -0,0 +1,12 @@ +--- rpython/rlib/rvmprof/src/shared/vmprof_unix.h.orig 2018-07-19 09:03:21 UTC ++++ rpython/rlib/rvmprof/src/shared/vmprof_unix.h +@@ -24,6 +24,9 @@ + + #include "vmprof_mt.h" + ++#ifdef __FreeBSD__ ++#include ++#endif + #include + + RPY_EXTERN void vmprof_ignore_signals(int ignored); Property changes on: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property