<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/4c511c9f36afad71335f61e4efea4010ad7408fc">https://github.com/macports/macports-ports/commit/4c511c9f36afad71335f61e4efea4010ad7408fc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4c511c9f36afad71335f61e4efea4010ad7408fc
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Nov 29 11:58:08 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> openssl PG: Add optional compiler wrapping confguration
</span>---
_resources/port1.0/group/openssl-1.0.tcl | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/openssl-1.0.tcl b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 07b988f9879..da6892cbd96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,8 @@
</span> #
# This port group handles setting ports up to build against specific openssl versions
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_wrapper 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> namespace eval openssl { }
options openssl.branch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +27,8 @@ default openssl_cache_cpath ""
</span> default openssl_cache_cmake_flags ""
default openssl_cache_configure ""
default openssl_cache_env_vars [list ]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl_cache_orig_cc ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl_cache_orig_cxx ""
</span>
proc openssl::default_branch {} {
# NOTE - Whenever the default branch is bumped, the revision
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,6 +146,7 @@ proc openssl::configure_build {} {
</span> global openssl_cache_branch_nodot openssl_cache_depends openssl_cache_env_vars
global openssl_cache_incdir openssl_cache_libdir openssl_cache_cmake_flags
global openssl_cache_configure openssl_cache_cpath
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global openssl_cache_orig_cc openssl_cache_orig_cxx
</span>
if { [openssl::is_enabled] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,6 +224,18 @@ proc openssl::configure_build {} {
</span> configure.args-append ${flag}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler_wrap {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "openssl: -> Setting openssl compiler wrap configuration"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${openssl_cache_orig_cc} eq "" && ${openssl_cache_orig_cxx} eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_orig_cc [compwrap::wrap_compiler cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_orig_cxx [compwrap::wrap_compiler cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compwrap.compiler_pre_flags -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc [compwrap::wrap_compiler cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx [compwrap::wrap_compiler cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> default {
return -code error "invalid method \"${meth}\" for openssl.configure"
}
</pre><pre style='margin:0'>
</pre>