<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/017f3f53a45208f69936944167d2a0e8ce95f979">https://github.com/macports/macports-ports/commit/017f3f53a45208f69936944167d2a0e8ce95f979</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 017f3f53a45 boost171: Add python 3.10 support and make default variant
</span>017f3f53a45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 017f3f53a45208f69936944167d2a0e8ce95f979
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Apr 8 10:02:26 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> boost171: Add python 3.10 support and make default variant
</span>---
devel/boost171/Portfile | 13 ++++++++-----
devel/boost171/files/avoid-private-fopen-python310.diff | 15 +++++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/Portfile b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43393a0459c..86672629e81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,7 +220,7 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_versions {2.7 3.5 3.6 3.7 3.8 3.9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_versions {2.7 3.5 3.6 3.7 3.8 3.9 3.10}
</span>
set pythons_ports {}
foreach v ${pythons_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,6 +244,8 @@ foreach v ${pythons_versions} {
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
if { ${s} > 30 } { set bppatch "patch-boost-python3.diff" } else { set bppatch "" }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/boostorg/python/commit/cbd2d9f033c61d29d0a1df14951f4ec91e7d05cd?diff=unified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${s} > 39 } { set fopenpatch "avoid-private-fopen-python310.diff" } else { set fopenpatch "" }
</span> variant ${p} description "Build Boost.Python for Python ${v}" conflicts {*}${c} debug "
# There is a conflict with python and debug support, so we should really change the 'variant' line above
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,7 +257,8 @@ foreach v ${pythons_versions} {
</span> configure.args-delete --without-libraries=python
configure.args-append --with-python=${prefix}/bin/python${v} --with-python-root=${prefix}/bin/python${v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append ${bppatch} patch-tools-build-src-tools-python.jam.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append ${bppatch} ${fopenpatch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tools-build-src-tools-python.jam.diff \
</span> patch-tools-build-src-tools-python-2.jam.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -265,7 +268,7 @@ foreach v ${pythons_versions} {
</span> }
if {![variant_isset debug]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set selected_python python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python python310
</span> foreach v ${pythons_versions} {
set s [string map {. {}} ${v}]
if {[variant_isset python${s}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,7 +305,7 @@ variant no_single description {Disable building single-threaded libraries} {
</span> }
subport ${name}-numpy {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> description Boost.Numpy library
long_description {*}${description}
depends_lib port:boost${tag}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,7 +330,7 @@ subport ${name}-numpy {
</span>
if {$subport eq $name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span>
patchfiles-append patch-disable-numpy-extension.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/files/avoid-private-fopen-python310.diff b/devel/boost171/files/avoid-private-fopen-python310.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9a92f77cc87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/files/avoid-private-fopen-python310.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/python/src/exec.cpp.orig 2022-04-08 09:44:07.505356533 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/python/src/exec.cpp 2022-04-08 09:45:31.823325923 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,10 +106,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *f = const_cast<char *>(filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Let python open the file to avoid potential binary incompatibilities.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PY_VERSION_HEX >= 0x03040000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE *fs = _Py_fopen(f, "r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *fs = fopen(f, "r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif PY_VERSION_HEX >= 0x03000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject *fo = Py_BuildValue("s", f);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE *fs = _Py_fopen(fo, "r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *fs = fopen(fo, "r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_DECREF(fo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
</span></pre><pre style='margin:0'>
</pre>