<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26477f6134e6b23fc341f9e794f5ba995cbde3cf">https://github.com/macports/macports-ports/commit/26477f6134e6b23fc341f9e794f5ba995cbde3cf</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 26477f6134e openssl*: Fix for 3+ universal archs
</span>26477f6134e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26477f6134e6b23fc341f9e794f5ba995cbde3cf
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sat Feb 11 15:35:18 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> openssl*: Fix for 3+ universal archs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The merger_dont_diff setup for the >2 archs case was never updated to
</span><span style='display:block; white-space:pre;color:#404040;'> reflect the new prefix with the move to libexec. It was also never
</span><span style='display:block; white-space:pre;color:#404040;'> updated for openssl3 to reflect the upstream naming change. That
</span><span style='display:block; white-space:pre;color:#404040;'> caused a broken opensslconf.h (configuration.h for openssl3) to be
</span><span style='display:block; white-space:pre;color:#404040;'> created in the >2 archs case, with no reported error.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This in turn caused Python +universal to build "successfully" with the
</span><span style='display:block; white-space:pre;color:#404040;'> hashlib and ssl extensions missing.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since this case is fairly rare (and not even allowed in 10.6+), it
</span><span style='display:block; white-space:pre;color:#404040;'> doesn't justify a revbump, even though it should technically get one.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For similar reasons, revbumping dependents isn't justifiable, though
</span><span style='display:block; white-space:pre;color:#404040;'> a note is provided suggesting rebuilding them (only in the relevant
</span><span style='display:block; white-space:pre;color:#404040;'> case).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built +universal on 10.5 x86_64 with x86_64, i386, and ppc as
</span><span style='display:block; white-space:pre;color:#404040;'> universal_archs. Resulting opensslconf.h (or configuration.h) setup
</span><span style='display:block; white-space:pre;color:#404040;'> is now reasonable. With the openssl* updates, built python26-27
</span><span style='display:block; white-space:pre;color:#404040;'> +universal and python32-35 +universal, and verified that the hashlib
</span><span style='display:block; white-space:pre;color:#404040;'> and ssl imports work in all three architectures. Currently,
</span><span style='display:block; white-space:pre;color:#404040;'> python36-311 don't build +universal in this configuration, for
</span><span style='display:block; white-space:pre;color:#404040;'> unrelated reasons.
</span><span style='display:block; white-space:pre;color:#404040;'> The normal builds of openssl11 and openssl3 were also tested on the
</span><span style='display:block; white-space:pre;color:#404040;'> full range of systems, due to the recent updates.
</span>---
devel/openssl10/Portfile | 5 ++++-
devel/openssl11/Portfile | 5 ++++-
devel/openssl3/Portfile | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl10/Portfile b/devel/openssl10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91d6311f2be..06321dadf70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,10 @@ pre-destroot {
</span> if {[variant_exists universal] && [variant_isset universal]} {
global merger_dont_diff
if {[llength ${universal_archs_to_use}] > 2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_dont_diff ${my_prefix}/include/openssl/opensslconf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Previous version/revisions got this wrong, but this situation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is too obscure to justify revbumping the dependents.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Universal dependents may need to be rebuilt."
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl11/Portfile b/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba46a5681d9..c9ba7569b0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,10 @@ pre-destroot {
</span> if {[variant_exists universal] && [variant_isset universal]} {
global merger_dont_diff
if {[llength ${universal_archs_to_use}] > 2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_dont_diff ${my_prefix}/include/openssl/opensslconf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Previous version/revisions got this wrong, but this situation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is too obscure to justify revbumping the dependents.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Universal dependents may need to be rebuilt."
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/Portfile b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 552e1ae5511..88a1879d183 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +119,10 @@ pre-destroot {
</span> if {[variant_exists universal] && [variant_isset universal]} {
global merger_dont_diff
if {[llength ${universal_archs_to_use}] > 2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_dont_diff ${my_prefix}/include/openssl/configuration.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Previous version/revisions got this wrong, but this situation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is too obscure to justify revbumping the dependents.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Universal dependents may need to be rebuilt."
</span> }
}
}
</pre><pre style='margin:0'>
</pre>