<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0030bc659c6d0e7466cc60ab4096b1194da29f86">https://github.com/macports/macports-ports/commit/0030bc659c6d0e7466cc60ab4096b1194da29f86</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 0030bc659c6 root6: Fix cppyy installation
</span>0030bc659c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0030bc659c6d0e7466cc60ab4096b1194da29f86
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Sep 22 13:37:07 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: Fix cppyy installation
</span>---
science/root6/Portfile | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7610c237584..08dfbdf20b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ PortGroup legacysupport 1.0
</span> # Please also check if Gate needs a revbump after root6 update
github.setup root-project root 6-22-02 v
version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> livecheck.version ${github.version}
# Use git commit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -457,9 +457,10 @@ foreach py_ver ${python_versions} {
</span> port:py${py_ver_no_dot}-jupyter \
port:py${py_ver_no_dot}-gnureadline \
port:py${py_ver_no_dot}-metakernel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install PyROOT lib in the correct place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install PyROOT in the correct place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mypyincdir ${frameworks_dir}/Python.framework/Versions/${active_python_version}/include
</span> set mypylibdir ${frameworks_dir}/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
set mypysitedir ${mypylibdir}/site-packages/
file mkdir ${destroot}${mypysitedir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -479,6 +480,14 @@ foreach py_ver ${python_versions} {
</span> foreach fname [ glob -tails -directory ${destroot}${install_prefix}/lib/root/ lib* ] {
ln -s ${install_prefix}/lib/root/${fname} ${destroot}${mypysitedir}/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix cppyy loader imports...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cppyy_lib_dir ${install_prefix}/lib/root/cppyy_backend/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${cppyy_lib_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach fname [ glob -tails -directory ${destroot}${install_prefix}/lib/root/ libcppyy* ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${install_prefix}/lib/root/${fname} ${destroot}${cppyy_lib_dir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${mypyincdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${install_prefix}/include/root/CPyCppyy ${destroot}${mypyincdir}/
</span> # Fix python version in scripts
set pystringtoreplace "/usr/bin/python"
foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
</pre><pre style='margin:0'>
</pre>