<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/db506fc6a016c329f391619d46e25a7a0c3ba65f">https://github.com/macports/macports-ports/commit/db506fc6a016c329f391619d46e25a7a0c3ba65f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new db506fc pypy: update to 5.7.0
</span>db506fc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit db506fc6a016c329f391619d46e25a7a0c3ba65f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 28 00:37:35 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> pypy: update to 5.7.0
</span>---
lang/pypy/Portfile | 17 ++++++++---------
lang/pypy/files/cbuild.py.diff | 20 --------------------
lang/pypy/files/configure.py.diff | 15 ---------------
lang/pypy/files/darwin.py.diff | 21 +++++++++++++++------
lang/pypy/files/paths.diff | 22 ++++++++++++++++++++++
5 files changed, 45 insertions(+), 50 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 f81b46d..e342929 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.7.0
</span> categories lang python devel
license MIT PSF
maintainers {jmr @jmroot} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,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 c3fc7187061fec762269496f1f5daa86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 df36dad3b2ee6f16145219a2ebc6aa715dc80227 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 aa26e72c1f30b77734198af6fb6f9ad7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 39b9412938904657800ac637acc4214f9f9faf1e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e
</span>
depends_build port:pkgconfig
depends_lib port:libffi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,13 @@ depends_lib port:libffi \
</span>
patchfiles darwin.py.diff \
make_output.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.py.diff \
</span> ffiplatform.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cbuild.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ paths.diff
</span>
post-patch {
reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ctypes_configure/cbuild.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pypy/tool/cpyext/extbuild.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rpython/translator/platform/distutils_platform.py
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,8 +85,7 @@ platform darwin {
</span> }
build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ld_archflags} ${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYPY_CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ld_archflags} ${configure.ldflags}"
</span>
build.dir ${worksrcpath}/pypy/goal
build.args --batch --verbose \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/cbuild.py.diff b/lang/pypy/files/cbuild.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4c1909b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/cbuild.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,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ctypes_configure/cbuild.py.orig 2016-03-10 02:34:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ctypes_configure/cbuild.py 2016-03-14 01:56:29.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- library_dirs = list(eci.library_dirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sys.platform == 'darwin' or # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.platform.startswith('freebsd')):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for s in ('/sw/', '/opt/local/', '/usr/local/'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for s in ['__PREFIX__']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if s + 'include' not in include_dirs and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.exists(s + 'include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_dirs.append(s + 'include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -383,7 +383,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.link_extra += ['/DEBUG'] # generate .pdb file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sys.platform == 'darwin' or # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.platform.startswith('freebsd')):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for s in ('/sw/', '/opt/local/', '/usr/local/'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for s in ['__PREFIX__']:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if s + 'include' not in self.include_dirs and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.exists(s + 'include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.include_dirs.append(s + 'include')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/configure.py.diff b/lang/pypy/files/configure.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35d3e35..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/configure.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;'>---- ctypes_configure/configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ctypes_configure/configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -567,11 +567,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%s: %d\\n", key, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def run_example_code(filepath, eci, noerr=False):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- executable = build_executable([filepath], eci, noerr=noerr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ executable = build_executable([filepath], eci, compiler_exe=os.getenv('PYPY_CC'), noerr=noerr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- output = py.process.cmdexec(executable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- section = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for line in output.splitlines():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- line = line.strip()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if line.startswith('-+- '): # start of a new section
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/darwin.py.diff b/lang/pypy/files/darwin.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 194ee50..1f2c33d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/files/darwin.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rpython/translator/platform/darwin.py.orig 2015-11-17 23:10:14.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rpython/translator/platform/darwin.py 2015-11-27 13:35:40.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rpython/translator/platform/darwin.py.orig 2017-03-20 06:55:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rpython/translator/platform/darwin.py 2017-03-27 23:20:47.000000000 +1100
</span> @@ -9,7 +9,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # since 10.5, so we use that as minimum requirement. Bumped to 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # because 10.11 does not ship with 10.5 versions of libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # since 10.5, so we use that as minimum requirement. Bumped to 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to allow the use of thread-local in __thread in C.
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>--DARWIN_VERSION_MIN = '-mmacosx-version-min=10.6'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DARWIN_VERSION_MIN = '-mmacosx-version-min=10.7'
</span> +DARWIN_VERSION_MIN = ''
class Darwin(posix.BasePosix):
name = "darwin"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,11 +104,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we get the basename of the executable we're trying to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (list(self.shared_only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + ['-dynamiclib', '-install_name', '@rpath/' + target_basename,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-undefined', 'dynamic_lookup', '-flat_namespace']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-undefined', 'dynamic_lookup']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ + args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _include_dirs_for_libffi(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,11 +111,15 @@
</span>
class Darwin_PowerPC(Darwin):#xxx fixme, mwp
name = "darwin_powerpc"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/paths.diff b/lang/pypy/files/paths.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..70c4906
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/files/paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pypy/tool/cpyext/extbuild.py.orig 2017-03-20 06:55:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pypy/tool/cpyext/extbuild.py 2017-03-27 23:35:49.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_extra = link_extra + ['/DEBUG'] # generate .pdb file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for s in ('/sw/', '/opt/local/'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for s in ('__PREFIX__',):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (s + 'include' not in include_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and os.path.exists(s + 'include')):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_dirs.append(s + 'include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rpython/translator/platform/distutils_platform.py.orig 2017-03-20 06:55:48.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rpython/translator/platform/distutils_platform.py 2017-03-27 23:41:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.link_extra += ['/DEBUG'] # generate .pdb file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.name == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # support Fink & Darwinports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for s in ('/sw/', '/opt/local/'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for s in ('__PREFIX__',):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if s + 'include' not in self.include_dirs and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.path.exists(s + 'include'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.include_dirs.append(s + 'include')
</span></pre><pre style='margin:0'>
</pre>