<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/ed645cc03c46e4d41fae0370b06777abbd6e89ce">https://github.com/macports/macports-ports/commit/ed645cc03c46e4d41fae0370b06777abbd6e89ce</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new ed645cc  cargo: avoid setting DYLD_LIBRARY_PATH
</span>ed645cc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ed645cc03c46e4d41fae0370b06777abbd6e89ce
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Nov 27 18:49:05 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;'>    Revert part of https://github.com/macports/macports-ports/commit/08960a3ac3a1c9690e149206156ccf0e53afd8e0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/57692
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://github.com/rust-lang/cargo/pull/6355
</span>---
 devel/cargo/Portfile              |  9 ++++++++-
 devel/cargo/files/patch-dyld.diff | 11 +++++++++++
 2 files changed, 19 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 dd653c6..29cefcc 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;'>@@ -10,7 +10,7 @@ if {${subport} ne "${name}-bootstrap"} {
</span> }
 PortGroup           cargo 1.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;'>@@ -42,6 +42,13 @@ if {${subport} ne "${name}-bootstrap"} {
</span>                     sha256  c2fb2e2629dd087533e454716eed1e9f195993cf3865ad2d00aaee3f8a6574c3 \
                     size    811145
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # use DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # without this change, --target and CARGO_BUILD_TARGET fail
</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;'>+    # see https://trac.macports.org/ticket/57692
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-dyld.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     pre-configure {
         # create Cargo.lock
         system -W ${worksrcpath} "${cargo.bin} update"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cargo/files/patch-dyld.diff b/devel/cargo/files/patch-dyld.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d6ac22f
</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/patch-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-11-02 16:00:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cargo/util/paths.rs        2018-11-27 18:03:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if cfg!(windows) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     } else if cfg!(target_os = "macos") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        "DYLD_LIBRARY_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        "DYLD_FALLBACK_LIBRARY_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         "LD_LIBRARY_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span></pre><pre style='margin:0'>

</pre>