<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/a1d0e087d0f35faef22ac7b151d5438f3b6a07c9">https://github.com/macports/macports-ports/commit/a1d0e087d0f35faef22ac7b151d5438f3b6a07c9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a1d0e087d0f35faef22ac7b151d5438f3b6a07c9
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Nov 26 13:32:32 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> openssl PG: Prepend install area to CPATH
</span>---
_resources/port1.0/group/openssl-1.0.tcl | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
<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 59f6f86e6a5..07b988f9879 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;'>@@ -21,6 +21,7 @@ default openssl_cache_branch_nodot ""
</span> default openssl_cache_depends ""
default openssl_cache_incdir ""
default openssl_cache_libdir ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0e0e0;'>@@ -137,8 +138,10 @@ proc openssl::remove_phase_env_var { var } {
</span> }
proc openssl::configure_build {} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span> global openssl_cache_branch_nodot openssl_cache_depends openssl_cache_env_vars
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global openssl_cache_incdir openssl_cache_libdir openssl_cache_cmake_flags openssl_cache_configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global openssl_cache_incdir openssl_cache_libdir openssl_cache_cmake_flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global openssl_cache_configure openssl_cache_cpath
</span>
if { [openssl::is_enabled] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,6 +192,14 @@ proc openssl::configure_build {} {
</span> configure.cppflags-prepend -I${openssl_cache_incdir}
configure.cflags-prepend -I${openssl_cache_incdir}
configure.ldflags-prepend -L${openssl_cache_libdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Look in specific install areas before the main prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prepend to CPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${openssl_cache_cpath} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-delete ${openssl_cache_cpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_cpath [openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath-prepend ${openssl_cache_cpath}
</span> }
cmake {
ui_debug "openssl: -> Setting openssl cmake configuration"
</pre><pre style='margin:0'>
</pre>