<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/11ceae4733696b3985547e89a04e70f7d9d4ce28">https://github.com/macports/macports-ports/commit/11ceae4733696b3985547e89a04e70f7d9d4ce28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 11ceae4733696b3985547e89a04e70f7d9d4ce28
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 29 12:43:42 2022 -0700

<span style='display:block; white-space:pre;color:#404040;'>    rust PG: refactor code
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Refactor code so that future changes are easier to see.
</span>---
 _resources/port1.0/group/rust-1.0.tcl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust-1.0.tcl b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f3b2b5cede1..f7e39249ffa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -658,20 +658,20 @@ proc rust::set_environment {} {
</span> 
     rust::append_envs     "RUST_BACKTRACE=1"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Propagate pkgconfig path to build and destroot phases as well.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Needed to work with openssl PG.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if { ${configure.pkg_config_path} ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        rust::append_envs "PKG_CONFIG_PATH=[join ${configure.pkg_config_path} :]" {build destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     rust::append_envs     CC=[compwrap::wrap_compiler cc]   {build destroot}
     rust::append_envs     CXX=[compwrap::wrap_compiler cxx] {build destroot}
 
     if { [option openssl.branch] ne "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        set openssl_ver                 [string map {. {}} [option openssl.branch]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        rust::append_envs               OPENSSL_DIR=${prefix}/libexec/openssl${openssl_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        compiler.cpath-prepend          ${prefix}/libexec/openssl${openssl_ver}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        compiler.library_path-prepend   ${prefix}/libexec/openssl${openssl_ver}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set openssl_ver                     [string map {. {}} [option openssl.branch]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rust::append_envs                   OPENSSL_DIR=${prefix}/libexec/openssl${openssl_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compiler.cpath-prepend              ${prefix}/libexec/openssl${openssl_ver}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compiler.library_path-prepend       ${prefix}/libexec/openssl${openssl_ver}/lib
</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;'>+    # Propagate pkgconfig path to build and destroot phases as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Needed to work with openssl PG.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { ${configure.pkg_config_path} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rust::append_envs "PKG_CONFIG_PATH=[join ${configure.pkg_config_path} :]" {build destroot}
</span>     }
 
     if {${subport} ne "rust" && [join [lrange [split ${subport} -] 0 1] -] ne "rust-bootstrap"} {
</pre><pre style='margin:0'>

</pre>