From 8d046de287eaf85f8b80816175363fbbcacfd73a Mon Sep 17 00:00:00 2001 From: Dave Date: Wed, 10 Jul 2024 02:43:27 -0400 Subject: [PATCH] fix: arm builds via disabling abseil tests (#2758) fix: disable abseil tests Signed-off-by: Dave Lee --- .github/workflows/release.yaml | 9 --------- Makefile | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 86d609210588..6a7682d47f62 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,15 +78,6 @@ jobs: echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> $CMAKE_CROSS_TOOLCHAIN GRPC_DIR=$PWD/grpc - # http://google.github.io/googletest/quickstart-cmake.html - # Seems otherwise cross-arch fails to find it - echo "include(FetchContent)" >> $GRPC_DIR/CMakeLists.txt - echo "FetchContent_Declare(" >> $GRPC_DIR/CMakeLists.txt - echo " googletest" >> $GRPC_DIR/CMakeLists.txt - echo " URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip" >> $GRPC_DIR/CMakeLists.txt - echo ")" >> $GRPC_DIR/CMakeLists.txt - echo "FetchContent_MakeAvailable(googletest)" >> $GRPC_DIR/CMakeLists.txt - cd grpc && cd cmake/build && sudo make --jobs 5 --output-sync=target install && \ GRPC_CROSS_BUILD_DIR=$GRPC_DIR/cmake/cross_build && \ mkdir -p $GRPC_CROSS_BUILD_DIR && \ diff --git a/Makefile b/Makefile index d4ca1e4fd2fb..ba1cc96bc576 100644 --- a/Makefile +++ b/Makefile @@ -701,6 +701,7 @@ backend/cpp/llama/llama.cpp: INSTALLED_PACKAGES=$(CURDIR)/backend/cpp/grpc/installed_packages INSTALLED_LIB_CMAKE=$(INSTALLED_PACKAGES)/lib/cmake ADDED_CMAKE_ARGS=-Dabsl_DIR=${INSTALLED_LIB_CMAKE}/absl \ + -DABSL_BUILD_TESTING=OFF \ -DProtobuf_DIR=${INSTALLED_LIB_CMAKE}/protobuf \ -Dutf8_range_DIR=${INSTALLED_LIB_CMAKE}/utf8_range \ -DgRPC_DIR=${INSTALLED_LIB_CMAKE}/grpc \