This is an automated email from the ASF dual-hosted git repository. mgreber pushed a commit to branch branch-1.18.x in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 44ae860f7e2d6e98c158fd9acc4b8db3c43cfbc3 Author: Jeffrey Smith <[email protected]> AuthorDate: Sat Jul 19 16:39:43 2025 -0400 KUDU-3678: Fix crcutil building on MacOS arm64 When building crcutil, it uses 'uname -p' to determine the processor, which prints 'arm'. This means that it doesn't match against the correct processor and adds -msse2 -msse4.2 to crcutil_flags, neither of which are supported on Apple silicon. This adds a new branch that specifically targets MacOS devices running on arm, allowing crcutil to compile correctly. Change-Id: I71a1e70a8bc29732a8d0b31724bdbf8e00e7a736 Reviewed-on: http://gerrit.cloudera.org:8080/23198 Tested-by: Alexey Serbin <[email protected]> Reviewed-by: Alexey Serbin <[email protected]> (cherry picked from commit cd56930be8e09648315cd02e4d824b243d853712) Reviewed-on: http://gerrit.cloudera.org:8080/23202 Reviewed-by: Marton Greber <[email protected]> Tested-by: Marton Greber <[email protected]> --- thirdparty/download-thirdparty.sh | 5 +++-- thirdparty/patches/crcutil-fix-macos-arm64-flags.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index 2029a3e8e..50bef973d 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -314,11 +314,12 @@ fetch_and_patch \ "patch -p1 < $TP_DIR/patches/curl-eventfd-double-close.patch" \ "autoreconf -fvi" -CRCUTIL_PATCHLEVEL=0 +CRCUTIL_PATCHLEVEL=1 fetch_and_patch \ crcutil-${CRCUTIL_VERSION}.tar.gz \ $CRCUTIL_SOURCE \ - $CRCUTIL_PATCHLEVEL + $CRCUTIL_PATCHLEVEL \ + "patch -p1 < $TP_DIR/patches/crcutil-fix-macos-arm64-flags.patch" LIBUNWIND_PATCHLEVEL=1 fetch_and_patch \ diff --git a/thirdparty/patches/crcutil-fix-macos-arm64-flags.patch b/thirdparty/patches/crcutil-fix-macos-arm64-flags.patch new file mode 100644 index 000000000..db0734503 --- /dev/null +++ b/thirdparty/patches/crcutil-fix-macos-arm64-flags.patch @@ -0,0 +1,11 @@ +---- a/autogen.sh 2025-07-18 14:55:00 ++++ b/autogen.sh 2025-07-19 15:24:27 +@@ -91,6 +91,8 @@ + crcutil_flags="${crcutil_flags}" + elif [[ "$PROCESSOR" == "aarch64" ]]; then + crcutil_flags="${crcutil_flags} -march=armv8-a" ++elif [[ "$PROCESSOR" == "arm" && "$KERNEL_NAME" == "Darwin" ]]; then ++ crcutil_flags="${crcutil_flags} -mcpu=apple-m1" + elif [[ "$IS_CLANG" = "0" ]]; then + # Newer GCC versions output just the major version with -dumpversion flag, + # but older GCC versions don't even recognize the -dumpfullversion flag which
