<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/15ef695c710d007f5aa4083b8e2d2ebdfd46e426">https://github.com/macports/macports-ports/commit/15ef695c710d007f5aa4083b8e2d2ebdfd46e426</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 15ef695 pypy: properly suppress embedded dependencies on pypy2; fix <10.14 build
</span>15ef695 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 15ef695c710d007f5aa4083b8e2d2ebdfd46e426
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Mon Oct 28 10:03:46 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> pypy: properly suppress embedded dependencies on pypy2; fix <10.14 build
</span>---
lang/pypy/Portfile | 17 +++++++++--------
lang/pypy/files/no-embed.diff | 12 ++++++++++++
2 files changed, 21 insertions(+), 8 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 84d5c79..f367741 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;'>@@ -8,7 +8,7 @@ PortGroup select 1.0
</span>
name pypy
bitbucket.setup pypy pypy 7.2.0 {release-pypy${python.branch}-v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang python devel
license MIT PSF
maintainers {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,7 @@ depends_run port:python_select
</span> select.entries [list python python-$subport $subport]
patchfiles darwin.py.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-embed.diff \
</span> make_output.diff \
ffiplatform.py.diff \
paths.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +83,7 @@ long_description \
</span> instead of CPython is speed, as it runs generally faster.
build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYPY_NO_EMBED_DEPENDENCIES=1 \
</span> "CFLAGS=${configure.cc_archflags} ${configure.cppflags}" \
"LDFLAGS=${configure.ld_archflags} ${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,16 +98,10 @@ destroot.env {*}${build.env}
</span> destroot.dir ${worksrcpath}/pypy/tool/release
destroot.args --builddir ${destroot}${prefix}/lib \
--archive-name ${subport} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-tk --no-embedded-dependencies
</span> destroot.target package.py
destroot.post_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport == "pypy3"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we need to do this after assigning to the variable above -- and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # since ${worksrcpath} depends on the subport, we can't do it earlier either
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append --no-embedded-dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
# sanity check, useful when upgrading, as upstream tends to move these around
if { ![catch {exec grep --exclude "*.orig" -Ilwre /sw -e ${prefix} ${worksrcpath}} result] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,6 +114,11 @@ post-patch {
</span> ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
${worksrcpath}/lib_pypy/_tkinter/tklib_build.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.branch} == "2.7" && ${macosx_deployment_target} != "10.14"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/MACOSX_DEPLOYMENT_TARGET/s/10.14/${macosx_deployment_target}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib-python/2.7/distutils/sysconfig_pypy.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # sanity check, likewise
if { ![catch {exec grep --exclude "*.orig" -lIwre __PREFIX__ ${worksrcpath}} result] } {
ui_warn "patching potentially didn't catch all references to __PREFIX__:\n$result"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/no-embed.diff b/lang/pypy/files/no-embed.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e54d7b3
</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/no-embed.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r 4a68d8d3d2fc pypy/tool/release/package.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pypy/tool/release/package.py Fri Oct 04 18:02:31 2019 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pypy/tool/release/package.py Mon Oct 28 09:41:10 2019 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,6 +321,8 @@ def package(*args, **kwds):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options.no_tk = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.environ.has_key("PYPY_EMBED_DEPENDENCIES"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options.embed_dependencies = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif os.environ.has_key("PYPY_NO_EMBED_DEPENDENCIES"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ options.embed_dependencies = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not options.builddir:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The import actually creates the udir directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from rpython.tool.udir import udir
</span></pre><pre style='margin:0'>
</pre>