From owner-svn-ports-head@freebsd.org Sat Jul 28 05:26:23 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2BF91063D37; Sat, 28 Jul 2018 05:26:23 +0000 (UTC) (envelope-from farrokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 561977AD31; Sat, 28 Jul 2018 05:26:23 +0000 (UTC) (envelope-from farrokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31847224E2; Sat, 28 Jul 2018 05:26:23 +0000 (UTC) (envelope-from farrokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6S5QNC1057182; Sat, 28 Jul 2018 05:26:23 GMT (envelope-from farrokhi@FreeBSD.org) Received: (from farrokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6S5QLoi057176; Sat, 28 Jul 2018 05:26:21 GMT (envelope-from farrokhi@FreeBSD.org) Message-Id: <201807280526.w6S5QLoi057176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: farrokhi set sender to farrokhi@FreeBSD.org using -f From: Babak Farrokhi Date: Sat, 28 Jul 2018 05:26:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475489 - in head/lang: pypy pypy/files pypy3/files X-SVN-Group: ports-head X-SVN-Commit-Author: farrokhi X-SVN-Commit-Paths: in head/lang: pypy pypy/files pypy3/files X-SVN-Commit-Revision: 475489 X-SVN-Commit-Repository: ports 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.27 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, 28 Jul 2018 05:26:23 -0000 Author: farrokhi Date: Sat Jul 28 05:26:21 2018 New Revision: 475489 URL: https://svnweb.freebsd.org/changeset/ports/475489 Log: lang/pypy and lang/pypy3: Fix rvmprof build on FreeBSD Originally pypy did not build on FreeBSD due to build failure in rvmprof. In order to build it on FreeBSD (and OpenBSD) you have to disable rvmprof during build process. This is what a previous patch [1][2] did to enable building on FreeBSD. This is a patch obtained from upstream [3] that actually solves the rvmprof build problem which enables building pypy/pypy3 on FreeBSD with rvmprof enabled. [1] https://svnweb.freebsd.org/changeset/ports/473994 [2] https://reviews.freebsd.org/D16138 [3] https://bitbucket.org/pypy/pypy/issues/2853/build-fails-on-freebsd-11x-x64#comment-46813575 Reviewed by: koobs, miwi, dbn Approved by: miwi, dbn Differential Revision: https://reviews.freebsd.org/D16378 Added: head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py (contents, props changed) head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h (contents, props changed) head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py (contents, props changed) head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h (contents, props changed) Deleted: head/lang/pypy/files/patch-pypy_config_pypyoption.py head/lang/pypy3/files/patch-pypy_config_pypyoption.py Modified: head/lang/pypy/Makefile head/lang/pypy/bsd.pypy.mk Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Sat Jul 28 03:37:53 2018 (r475488) +++ head/lang/pypy/Makefile Sat Jul 28 05:26:21 2018 (r475489) @@ -105,7 +105,7 @@ 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 Modified: head/lang/pypy/bsd.pypy.mk ============================================================================== --- head/lang/pypy/bsd.pypy.mk Sat Jul 28 03:37:53 2018 (r475488) +++ head/lang/pypy/bsd.pypy.mk Sat Jul 28 05:26:21 2018 (r475489) @@ -13,8 +13,10 @@ PLIST_SUB+= PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_ .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 Added: head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_cintf.py Sat Jul 28 05:26:21 2018 (r475489) @@ -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: Added: head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h Sat Jul 28 05:26:21 2018 (r475489) @@ -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); Added: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_cintf.py Sat Jul 28 05:26:21 2018 (r475489) @@ -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: Added: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_vmprof__unix.h Sat Jul 28 05:26:21 2018 (r475489) @@ -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);