<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/348d50b0d8463afba316cecb353b07bee629cb99">https://github.com/macports/macports-ports/commit/348d50b0d8463afba316cecb353b07bee629cb99</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 348d50b0d8463afba316cecb353b07bee629cb99
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Oct 19 09:20:44 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> openssl PG: Configure dependencies in branch option callback
</span>---
_resources/port1.0/group/openssl-1.0.tcl | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
<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 da668d1798d..8f60da203db 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;'>@@ -19,6 +19,8 @@ default openssl.configure {}
</span> # cache variables storing current configuration state
default openssl_cache_branch_nodot ""
default openssl_cache_depends ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl_cache_incdir ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl_cache_libdir ""
</span>
proc openssl::default_branch {} {
return 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +75,7 @@ proc openssl::set_openssl_dependency {} {
</span> }
proc openssl::configure_build {} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global openssl_cache_incdir openssl_cache_libdir
</span>
ui_debug "Configure Types '[option openssl.configure]'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,9 +94,18 @@ proc openssl::configure_build {} {
</span> }
build_flags {
ui_debug " -> Setting openssl build flags configuration"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-prepend -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L[openssl::lib_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${openssl_cache_incdir} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-delete -I${openssl_cache_incdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-delete -I${openssl_cache_incdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${openssl_cache_libdir} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${openssl_cache_libdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_incdir [openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_libdir [openssl::lib_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${openssl_cache_incdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend -I${openssl_cache_incdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${openssl_cache_libdir}
</span> }
default {
return -code error "invalid method \"${meth}\" for openssl.configure"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +117,13 @@ proc openssl::configure_build {} {
</span>
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc openssl::branch_proc {option action args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl::set_openssl_dependency
</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;'>+option_proc openssl.branch openssl::branch_proc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc openssl::configure_proc {option action args} {
if {$action ne "set"} return
openssl::configure_build
</pre><pre style='margin:0'>
</pre>