svn commit: r443834 - in head/lang: pypy pypy/files pypy3 pypy3/files

[David Naylor]

Author: dbn
Date: Sun Jun 18 16:55:38 2017
New Revision: 443834
URL: https://svnweb.freebsd.org/changeset/ports/443834

Log:
  lang/pypy(3): update to 5.8
  
  Change Log:
   - supports upstream library 2.7.13 and 3.5.3
   - critical bugs fixed in shadowstack
   - native support for profiling frames in vmprof
   - performance improvements for pack* and unpack* structs
   - cffi updates to 1.10.1
   - numpy 1.13.0 requires at least this version

Added:
  head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_machine.c   (contents, props changed)
  head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_machine.c   (contents, props changed)
Deleted:
  head/lang/pypy/files/patch-lib-python_2.7_distutils_sysconfig__pypy.py
  head/lang/pypy/files/patch-rpython_translator_platform_posix.py
  head/lang/pypy3/files/patch-rpython_translator_platform_posix.py
Modified:
  head/lang/pypy/Makefile
  head/lang/pypy/bsd.pypy.cffi.mk
  head/lang/pypy/distinfo
  head/lang/pypy3/Makefile
  head/lang/pypy3/distinfo

Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile	Sun Jun 18 16:48:25 2017	(r443833)
+++ head/lang/pypy/Makefile	Sun Jun 18 16:55:38 2017	(r443834)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	pypy
-DISTVERSION?=	5.7.1	# Also update bsd.pypy.cffi.mk
-PORTREVISION?=	1
+DISTVERSION?=	5.8.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

Modified: head/lang/pypy/bsd.pypy.cffi.mk
==============================================================================
--- head/lang/pypy/bsd.pypy.cffi.mk	Sun Jun 18 16:48:25 2017	(r443833)
+++ head/lang/pypy/bsd.pypy.cffi.mk	Sun Jun 18 16:55:38 2017	(r443834)
@@ -11,7 +11,7 @@ PLIST_FILES=	%%PYPY_DIR%%/lib_pypy/${CFFI_MODULE}_cffi
 CFFI_MODULE?=	_${PORTNAME}
 
 PYTHON_IMPL=	pypy
-PYTHON_PORTVERSION?=	5.7.1
+PYTHON_PORTVERSION?=	5.8.0
 PYTHON_PKGNAMEPREFIX=	pypy-
 PYTHON_CMD=	${LOCALBASE}/bin/${PYTHON_IMPL}
 

Modified: head/lang/pypy/distinfo
==============================================================================
--- head/lang/pypy/distinfo	Sun Jun 18 16:48:25 2017	(r443833)
+++ head/lang/pypy/distinfo	Sun Jun 18 16:55:38 2017	(r443834)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491510301
-SHA256 (pypy2-v5.7.1-src.tar.bz2) = d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f
-SIZE (pypy2-v5.7.1-src.tar.bz2) = 18940413
+TIMESTAMP = 1497478804
+SHA256 (pypy2-v5.8.0-src.tar.bz2) = 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5
+SIZE (pypy2-v5.8.0-src.tar.bz2) = 19163498

Added: head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_machine.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/pypy/files/patch-rpython_rlib_rvmprof_src_shared_machine.c	Sun Jun 18 16:55:38 2017	(r443834)
@@ -0,0 +1,20 @@
+--- rpython/rlib/rvmprof/src/shared/machine.c.orig	2017-06-05 20:40:44 UTC
++++ rpython/rlib/rvmprof/src/shared/machine.c
+@@ -28,6 +28,8 @@ const char * vmp_machine_os_name(void)
+     #endif
+ #elif __linux__
+     return "linux";
++#elif __FreeBSD__
++    return "freebsd";
+ #else
+     #error "Unknown compiler"
+ #endif
+@@ -39,7 +41,7 @@ long vmp_fd_to_path(int fd, char * buffe
+     char proffs[24];
+     (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+     return readlink(proffs, buffer, buffer_len);
+-#elif defined(VMPROF_UNIX)
++#elif defined(VMPROF_UNIX) && !defined(__FreeBSD__)
+     fcntl(fd, F_GETPATH, buffer);
+     return strlen(buffer);
+ #endif

Modified: head/lang/pypy3/Makefile
==============================================================================
--- head/lang/pypy3/Makefile	Sun Jun 18 16:48:25 2017	(r443833)
+++ head/lang/pypy3/Makefile	Sun Jun 18 16:55:38 2017	(r443834)
@@ -2,8 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	pypy3
-DISTVERSION=	5.7.1
-PORTREVISION=	2
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src
 
 MASTERDIR=	${.CURDIR}/../pypy

Modified: head/lang/pypy3/distinfo
==============================================================================
--- head/lang/pypy3/distinfo	Sun Jun 18 16:48:25 2017	(r443833)
+++ head/lang/pypy3/distinfo	Sun Jun 18 16:55:38 2017	(r443834)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491510361
-SHA256 (pypy3-v5.7.1-src.tar.bz2) = 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0
-SIZE (pypy3-v5.7.1-src.tar.bz2) = 28811162
+TIMESTAMP = 1497478958
+SHA256 (pypy3-v5.8.0-src.tar.bz2) = 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223
+SIZE (pypy3-v5.8.0-src.tar.bz2) = 28986883

Added: head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_machine.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_shared_machine.c	Sun Jun 18 16:55:38 2017	(r443834)
@@ -0,0 +1,20 @@
+--- rpython/rlib/rvmprof/src/shared/machine.c.orig	2017-06-05 20:40:44 UTC
++++ rpython/rlib/rvmprof/src/shared/machine.c
+@@ -28,6 +28,8 @@ const char * vmp_machine_os_name(void)
+     #endif
+ #elif __linux__
+     return "linux";
++#elif __FreeBSD__
++    return "freebsd";
+ #else
+     #error "Unknown compiler"
+ #endif
+@@ -39,7 +41,7 @@ long vmp_fd_to_path(int fd, char * buffe
+     char proffs[24];
+     (void)snprintf(proffs, 24, "/proc/self/fd/%d", fd);
+     return readlink(proffs, buffer, buffer_len);
+-#elif defined(VMPROF_UNIX)
++#elif defined(VMPROF_UNIX) && !defined(__FreeBSD__)
+     fcntl(fd, F_GETPATH, buffer);
+     return strlen(buffer);
+ #endif