<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/904294423144380c6eb9a25b21798ba1b121065d">https://github.com/macports/macports-ports/commit/904294423144380c6eb9a25b21798ba1b121065d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 904294423144380c6eb9a25b21798ba1b121065d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 20 16:45:29 2016 +1100
<span style='display:block; white-space:pre;color:#404040;'> pypy: update to 5.6.0
</span>---
lang/pypy/Portfile | 21 ++++++++-------------
lang/pypy/files/rtime.py.diff | 15 ---------------
2 files changed, 8 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/Portfile b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e95e2a..8b2222f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
name pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.0
</span> categories lang python devel
license MIT PSF
maintainers jmr openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +19,9 @@ homepage http://pypy.org/
</span> master_sites https://bitbucket.org/pypy/pypy/downloads/
use_bzip2 yes
distname ${name}2-v${version}-src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 d1d197d16331aa23a7fd4b5d4c3c1717 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1fa3b9972637aeb597970c7b4666db51a6cffbd6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 45dbc50c81498f6f1067201b8fc887074b43b84ee32cc47f15e7db17571e9352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 c3fc7187061fec762269496f1f5daa86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 df36dad3b2ee6f16145219a2ebc6aa715dc80227 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0
</span>
depends_build port:pkgconfig
depends_lib port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,9 +45,9 @@ post-patch {
</span> use_configure no
# use pypy to build if it's already installed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if {[file executable ${prefix}/lib/pypy/pypy]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# build.cmd ${prefix}/lib/pypy/pypy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[file executable ${prefix}/lib/pypy/pypy]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${prefix}/lib/pypy/pypy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> if {${os.platform} eq "darwin" && ${os.arch} eq "i386" && ![catch {sysctl hw.cpu64bit_capable} is64bit] && $is64bit == 1} {
depends_build-append port:pypy-bootstrap
build.cmd ${prefix}/lib/pypy-bootstrap/bin/pypy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +55,7 @@ use_configure no
</span> depends_build-append port:python27
build.cmd ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# a lot of memory is used before the C compiler even runs, so limit build.jobs
# according to available memory more tightly than the default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,10 +82,6 @@ platform darwin {
</span> if {${os.major} >= 9} {
build.cmd arch -${build_arch} ${build.cmd}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # MacOS Sierra patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append rtime.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/rtime.py.diff b/lang/pypy/files/rtime.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8f69a1e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/rtime.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rpython/rlib/rtime.py 2016-09-06 05:46:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rpython/rlib/rtime.py 2016-09-28 15:56:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,11 +163,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- globals().update(rffi_platform.configure(CConfigForClockGetTime))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TIMESPEC = TIMESPEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLOCK_PROCESS_CPUTIME_ID = CLOCK_PROCESS_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eci_with_lrt = eci.merge(ExternalCompilationInfo(libraries=['rt']))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c_clock_gettime = external('clock_gettime',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lltype.Signed, lltype.Ptr(TIMESPEC)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rffi.INT, releasegil=False,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- compilation_info=eci_with_lrt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rffi.INT, releasegil=False)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if need_rusage:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUSAGE = RUSAGE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUSAGE_SELF = RUSAGE_SELF or 0
</span></pre><pre style='margin:0'>
</pre>