<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/32307f47e04ab9abb61d3d3fa610bfd3440d0a5b">https://github.com/macports/macports-ports/commit/32307f47e04ab9abb61d3d3fa610bfd3440d0a5b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 32307f47e04ab9abb61d3d3fa610bfd3440d0a5b
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Apr 14 17:16:42 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    apache-arrow: Simplify adding LLVM bin directory to PATH
</span>---
 devel/apache-arrow/Portfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apache-arrow/Portfile b/devel/apache-arrow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38202bbb059..c733bd73b89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apache-arrow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/apache-arrow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           cmake 1.1
</span> PortGroup           github 1.0
 
 github.setup        apache arrow 3.0.0 apache-arrow-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            6
</span> name                ${github.author}-${github.project}
 
 categories          devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,7 @@ cmake.build_type    Release
</span> 
 set llvm_version    10
 set llvm_prefix     ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_bin        ${llvm_prefix}/bin
</span> 
 cmake.module_path-append \
                     ${llvm_prefix}/lib/cmake/llvm \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,13 +55,6 @@ if { ${os.platform} eq "darwin" && ${os.major} < 17 } {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach f [glob -nocomplain ${prefix}/bin/ll*-${llvm_version}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ln -s ${f} ${workpath}/bin/[strsed [file tail ${f}] "s|-${llvm_version}$||"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Remove incorrect make dependency on SDK that cmake adds on some systems
 # See https://github.com/grpc/grpc/issues/24902
 post-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,14 +155,14 @@ if {${name} eq ${subport}} {
</span>                     -DPython3_EXECUTABLE=${python_bin}
 
     configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "PATH=${llvm_bin}:$env(PATH)"
</span> 
     build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "PATH=${llvm_bin}:$env(PATH)"
</span>     build.target
 
     destroot.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "PATH=${llvm_bin}:$env(PATH)"
</span>     destroot.cmd    ${build.cmd}
     destroot.destdir    DESTDIR=${destroot}
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,7 +230,7 @@ if {[string match "py*" ${subport}]} {
</span>     # macOS wheel:
     # https://github.com/apache/arrow/blob/master/ci/scripts/python_wheel_macos_build.sh
     build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "PATH=${workpath}/bin:$env(PATH)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "PATH=${llvm_bin}:$env(PATH)" \
</span>                     "PYARROW_CMAKE_OPTIONS=[concat {*}${configure.pre_args} {*}${configure.args}]" \
                     PYARROW_INSTALL_TESTS=1 \
                     PYARROW_WITH_DATASET=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,7 +255,7 @@ if {[string match "py*" ${subport}]} {
</span>                     --bundle-arrow-cpp bdist_wheel
 
     destroot.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "${python.prefix}/bin:${workpath}/bin:$env(PATH)" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "PATH=${python.prefix}/bin:${llvm_bin}:$env(PATH)" \
</span>                     CCACHE_DIR=${workpath}/.ccache
     destroot.dir    ${build.dir}
 
</pre><pre style='margin:0'>

</pre>