From e906168cc19378358d8fa1c1559f48e4b920aa37 Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Fri, 10 Jul 2026 08:35:31 +0200 Subject: [PATCH] fix: accept Xcode 26.5's renamed libtool version string in iOS Arrow build (#581) Co-authored-by: Claude Fable 5 --- thirdparty/arrow/arrow.ios.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/thirdparty/arrow/arrow.ios.patch b/thirdparty/arrow/arrow.ios.patch index b84ba5d..7de20d8 100644 --- a/thirdparty/arrow/arrow.ios.patch +++ b/thirdparty/arrow/arrow.ios.patch @@ -24,3 +24,16 @@ index 0f5840676..cf68bfdcb 100644 static Result Make(ExecPlan* plan, std::vector inputs, const ExecNodeOptions& options) { +diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake +index 1234567..abcdefg 100644 +--- a/cpp/cmake_modules/BuildUtils.cmake ++++ b/cpp/cmake_modules/BuildUtils.cmake +@@ -110,7 +110,7 @@ + execute_process(COMMAND ${LIBTOOL_MACOS} -V + OUTPUT_VARIABLE LIBTOOL_V_OUTPUT + OUTPUT_STRIP_TRAILING_WHITESPACE) +- if(NOT "${LIBTOOL_V_OUTPUT}" MATCHES ".*cctools-([0-9.]+).*") ++ if(NOT "${LIBTOOL_V_OUTPUT}" MATCHES ".*cctools[-_a-z]*([0-9.]+).*") + message(FATAL_ERROR "libtool found appears not to be Apple's libtool: ${LIBTOOL_MACOS}" + ) + endif()