<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/db144f5b7a685af31325a16a3aa71c80d3821654">https://github.com/macports/macports-ports/commit/db144f5b7a685af31325a16a3aa71c80d3821654</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 db144f5b7a6 emscripten: ensure build uses MacPorts Python
</span>db144f5b7a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit db144f5b7a685af31325a16a3aa71c80d3821654
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 3 09:25:39 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> emscripten: ensure build uses MacPorts Python
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span><span style='display:block; white-space:pre;color:#404040;'> See
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/b2e86165bc5d46bf123486879b61289d1411c0d0#commitcomment-49061343
</span>---
lang/emscripten/Portfile | 3 ++-
lang/emscripten/files/patch-macports_python.diff | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/emscripten/Portfile b/lang/emscripten/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96c74df7cce..efc4417fa28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/emscripten/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/emscripten/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,8 @@ if {${subport} eq ${name}} {
</span>
# ensure use of MacPorts python
reinplace "s|__MACPORTS_PYTHON__|${prefix}/bin/python${pyver}|g" ${worksrcpath}/tools/run_python.sh \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/tools/run_python_compiler.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/run_python_compiler.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tools/install.py
</span> system -W ${worksrcpath} "${prefix}/bin/python${pyver} tools/create_entry_points.py"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/emscripten/files/patch-macports_python.diff b/lang/emscripten/files/patch-macports_python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b342123a6ef..c57cb6ea860 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/emscripten/files/patch-macports_python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/emscripten/files/patch-macports_python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,3 +28,11 @@
</span> fi
if [ -z "$PYTHON" ]; then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/install.py.orig 2021-04-03 09:01:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/install.py 2021-04-03 09:03:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!__MACPORTS_PYTHON__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright 2020 The Emscripten Authors. All rights reserved.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Emscripten is available under two separate licenses, the MIT license and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # University of Illinois/NCSA Open Source License. Both these licenses can be
</span></pre><pre style='margin:0'>
</pre>