<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/20fa8bf3fa4600bf0f626ff66de0bfd42d8ef08c">https://github.com/macports/macports-ports/commit/20fa8bf3fa4600bf0f626ff66de0bfd42d8ef08c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20fa8bf3fa4600bf0f626ff66de0bfd42d8ef08c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 29 13:39:57 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    cargo: avoid setting DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;color:#404040;'>    Without this change, --target fails
</span><span style='display:block; white-space:pre;color:#404040;'>    see https://users.rust-lang.org/t/subprocess-and-dynamic-library-linking-problem-interaction/7873
</span><span style='display:block; white-space:pre;color:#404040;'>    see https://github.com/rust-lang/cargo/issues/2888
</span>---
 devel/cargo/Portfile             |  8 +++++++-
 devel/cargo/files/path-dyld.diff | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cargo/Portfile b/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74c1a28..945b024 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 
 github.setup        rust-lang cargo 0.24.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> categories          devel
 platforms           darwin
 supported_archs     i386 x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,12 @@ if {${build_arch} eq "i386"} {
</span> # github.setup sets this to yes, breaking the stage0 fetch
 fetch.ignore_sslcert no
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# set DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# without this change, --target fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://users.rust-lang.org/t/subprocess-and-dynamic-library-linking-problem-interaction/7873
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/rust-lang/cargo/issues/2888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   path-dyld.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure       no
 
 build.cmd           ${workpath}/${stage0(distname)}/${name}/bin/cargo
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cargo/files/path-dyld.diff b/devel/cargo/files/path-dyld.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9c7c1d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cargo/files/path-dyld.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cargo/util/paths.rs.orig   2018-02-01 14:15:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cargo/util/paths.rs        2018-03-20 18:23:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pub fn dylib_path_envvar() -> &'static str {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if cfg!(windows) {"PATH"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    else if cfg!(target_os = "macos") {"DYLD_LIBRARY_PATH"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    else if cfg!(target_os = "macos") {"DYLD_FALLBACK_LIBRARY_PATH"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     else {"LD_LIBRARY_PATH"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>