<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a80c8a588c168815c6fdb5e776269f4859b84441">https://github.com/macports/macports-ports/commit/a80c8a588c168815c6fdb5e776269f4859b84441</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a80c8a588c168815c6fdb5e776269f4859b84441
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Jul 30 09:06:32 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> apache-arrow: Update to version 13.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 13.0.0
</span><span style='display:block; white-space:pre;color:#404040;'> * Add Python 311
</span><span style='display:block; white-space:pre;color:#404040;'> * Delete Python 37
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove jemalloc dependency
</span><span style='display:block; white-space:pre;color:#404040;'> * See: https://github.com/jemalloc/jemalloc/issues/2511
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/67900
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/67896
</span>---
devel/apache-arrow/Portfile | 39 +++++++++++++++-------------
devel/apache-arrow/files/patch-absl-ver.diff | 11 --------
devel/apache-arrow/files/patch-io_util.diff | 25 ------------------
3 files changed, 21 insertions(+), 54 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 cdb49a36f90..932842ea300 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;'>@@ -8,8 +8,8 @@ PortGroup active_variants 1.1
</span>
boost.version 1.81
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup apache arrow 12.0.0 apache-arrow-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup apache arrow 13.0.0 apache-arrow-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name ${github.author}-${github.project}
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description Apache Arrow is a development platform for in-memory \
</span> analytics. It contains a set of technologies that \
enable big data systems to process and move data fast.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 060f7b3ea56d418b089aee4632c363fb03381abb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 34bc4f650a3807c832ebd299cb73c60fae34ec81efba23df2435548a166d5ca8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19843276
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cf775adc9440e6200bdee8ce37d78fe6b5b186fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 286ad68b17702caaa46b9f8de5797d9511a01748728221ed9921171166928d5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20213466
</span>
compiler.cxx_standard \
2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ set cmake_build_type \
</span> # At least remove a dependency on LLVM for PPC, where it is broken.
# If Gandiva is added to the build, please add it inside the clause below.
if {${build_arch} ni [list ppc ppc64]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_version 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_version 16
</span> set llvm_prefix ${prefix}/libexec/llvm-${llvm_version}
set llvm_bin ${llvm_prefix}/bin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,6 @@ depends_lib-append \
</span> port:gmake \
port:grpc \
path:lib/libglog.dylib:google-glog \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jemalloc \
</span> port:libutf8proc \
port:lz4 \
port:ninja \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +82,6 @@ depends_lib-append \
</span> port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/apache/arrow/pull/35046
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-io_util.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/apache/arrow/issues/35833
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-absl-ver.diff
</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;'>@@ -115,7 +109,9 @@ post-configure {
</span> # macOS wheel:
# https://github.com/apache/arrow/blob/main/ci/scripts/python_wheel_macos_build.sh
# Re rpath see: https://arrow.apache.org/docs/r/articles/developers/setup.html#rpath-issues
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also: https://github.com/apache/arrow/issues/35045
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also: https://github.com/apache/arrow/issues/35045,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/apache/arrow/issues/37010
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DARROW_ACERO:BOOL=OFF \
-DARROW_BUILD_SHARED:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +126,7 @@ configure.args-append \
</span> -DARROW_GCS:BOOL=ON \
-DARROW_HDFS:BOOL=ON \
-DARROW_INSTALL_NAME_RPATH:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DARROW_JEMALLOC:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARROW_JEMALLOC:BOOL=OFF \
</span> -DARROW_JSON:BOOL=ON \
-DARROW_MIMALLOC:BOOL=ON \
-DARROW_ORC:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,9 +135,9 @@ configure.args-append \
</span> -DARROW_PLASMA:BOOL=ON \
-DARROW_PROTOBUF_USE_SHARED:BOOL=ON \
-DARROW_PYTHON:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DARROW_RPATH_ORIGIN:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARROW_RPATH_ORIGIN:BOOL=ON \
</span> -DARROW_S3:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DARROW_SUBSTRAIT:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DARROW_SUBSTRAIT:BOOL=ON \
</span> -DARROW_USE_CCACHE:BOOL=ON \
-DARROW_TENSORFLOW:BOOL=OFF \
-DARROW_UTF8PROC_USE_SHARED:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,9 +149,13 @@ configure.args-append \
</span> -DARROW_WITH_ZSTD:BOOL=ON \
-Dc-ares_INCLUDE_DIR:PATH=${prefix}/include \
-DgRPC_ROOT:PATH=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Djemalloc_SOURCE:STRING=SYSTEM \
</span> -DRE2_SOURCE:STRING=SYSTEM
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.arch} eq "arm" && ${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_APPLE_SILICON_PROCESSOR=arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 12} {
# arrow downloads mimalloc version which is broken for < 10.8 due to missing MACH_TASK_BASIC_INFO_COUNT etc.
configure.args-replace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,7 +201,7 @@ proc change_arrow_rpath { binname libname_re } {
</span> }
# create Python subports
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_versions [list 39 310]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions [list 39 310 311]
</span> foreach v ${python_versions} {
subport py${v}-py${github.project} {
set python.version ${v}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,6 +288,8 @@ if {[string match "py*" ${subport}]} {
</span> configure.pre_args-replace \
{-DCMAKE_CXX_COMPILER="$CXX"} \
-DCMAKE_CXX_COMPILER:FILEPATH=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-DARROW_SIMD_LEVEL="SSE4_2"}
</span> if {${cmake.generator} ne {Ninja}} {
configure.pre_args-replace \
"-DCMAKE_MAKE_PROGRAM=${python.bin} setup.py --no-user-cfg" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,6 +309,7 @@ if {[string match "py*" ${subport}]} {
</span> -Dre2_DIR:PATH=${prefix}/lib/cmake/grpc/modules
build.env-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "_PYTHON_HOST_PLATFORM=macosx-${macosx_deployment_target}-${build_arch}" \
</span> "PKG_CONFIG_PATH=/usr/lib/pkgconfig:${build.dir}/install/lib/pkgconfig" \
PYARROW_BOOST_USE_SHARED=1 \
PYARROW_BUILD_TYPE=${cmake_build_type} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apache-arrow/files/patch-absl-ver.diff b/devel/apache-arrow/files/patch-absl-ver.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68596e568b0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apache-arrow/files/patch-absl-ver.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cpp/cmake_modules/ThirdpartyToolchain.cmake.orig 2023-04-21 16:37:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cpp/cmake_modules/ThirdpartyToolchain.cmake 2023-06-01 23:10:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2823,7 +2823,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 20211102 or later. We need to update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ARROW_ABSL_REQUIRED_LTS_VERSIONS list when new Abseil LTS is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # released.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ARROW_ABSL_REQUIRED_LTS_VERSIONS 20211102 20220623)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(ARROW_ABSL_REQUIRED_LTS_VERSIONS 20230125 20220623 20211102)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach(_VERSION ${ARROW_ABSL_REQUIRED_LTS_VERSIONS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(absl ${_VERSION})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(absl_FOUND)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/apache-arrow/files/patch-io_util.diff b/devel/apache-arrow/files/patch-io_util.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8373dcb3a00..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/apache-arrow/files/patch-io_util.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cpp/src/arrow/util/io_util.cc.orig 2023-01-18 16:38:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cpp/src/arrow/util/io_util.cc 2023-04-11 07:44:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2138,6 +2138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // OSX ------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #ifdef MACH_TASK_BASIC_INFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct mach_task_basic_info info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2145,6 +2146,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARROW_LOG(WARNING) << "Can't resolve RSS value";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct task_basic_info info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mach_msg_type_number_t infoCount = TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&info, &infoCount) != KERN_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ARROW_LOG(WARNING) << "Can't resolve RSS value";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return static_cast<int64_t>(info.resident_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__linux__)
</span></pre><pre style='margin:0'>
</pre>