<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/6e0615d2da4d59cf9d5d18e4ef2db1f687f004c0">https://github.com/macports/macports-ports/commit/6e0615d2da4d59cf9d5d18e4ef2db1f687f004c0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6e0615d2da4d59cf9d5d18e4ef2db1f687f004c0
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Apr 23 06:00:03 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> ngsolve: fix build of stub files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> pybind11-stubgen failed during destroot, but installation continued.
</span>---
math/ngsolve/Portfile | 25 ++++++++++++++++++++++---
math/ngsolve/files/pybind11-stubgen | 3 +++
2 files changed, 25 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/Portfile b/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91d1c1d5c74..7c858f85687 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup cmake 1.1
</span> PortGroup active_variants 1.1
github.setup NGSolve ngsolve 6.2.2004 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
categories math
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +90,27 @@ foreach pdv ${pythonversions} {
</span> depends_build-append port:pybind11 \
port:py${pv}-pybind11-stubgen
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${frameworks_dir}/Python.framework/Versions/${pdv}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${frameworks_dir}/Python.framework/Versions/${pdv}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # during destroot, must find pybind11-stubgen binary, ngsolve Python module, and NGSolve library, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # must modify PATH, PYTHONPATH, and DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # however, DYLD environment variables are not inherited by subprocesses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://lists.macports.org/pipermail/macports-dev/2021-April/043222.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${cmake.build_dir}/macports_bin/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${filespath}/pybind11-stubgen ${cmake.build_dir}/macports_bin/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_PYTHONPATH__|${destroot}${prefix}/lib/python${pdv}/site-packages/|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports_bin/bin/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_DYLD_LIBRARY_PATH__|${destroot}${prefix}/lib|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports_bin/bin/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_PYTHON_BIN__|${frameworks_dir}/Python.framework/Versions/${pdv}/bin|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports_bin/bin/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${cmake.build_dir}/macports_bin/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PATH=${cmake.build_dir}/macports_bin/bin:$env(PATH)
</span>
set any_python yes
require_active_variants netgen python${pv}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/pybind11-stubgen b/math/ngsolve/files/pybind11-stubgen
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..061e290dfa9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/files/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec env PYTHONPATH='__MACPORTS_PYTHONPATH__' DYLD_LIBRARY_PATH='__MACPORTS_DYLD_LIBRARY_PATH__' __MACPORTS_PYTHON_BIN__/pybind11-stubgen $*
</span></pre><pre style='margin:0'>
</pre>