From dbf26fc7959519ce19534fa12a0fd374f6544cef Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Thu, 13 Jul 2023 11:25:57 -0700 Subject: [PATCH] Backport #1116 to v11.x --- recipe/build-arrow.sh | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build-arrow.sh b/recipe/build-arrow.sh index 2be64c518..d5bb08dc1 100644 --- a/recipe/build-arrow.sh +++ b/recipe/build-arrow.sh @@ -44,7 +44,7 @@ if [[ "${build_platform}" != "${target_platform}" ]]; then EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DCLANG_EXECUTABLE=${BUILD_PREFIX}/bin/${CONDA_TOOLCHAIN_HOST}-clang" EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DLLVM_LINK_EXECUTABLE=${BUILD_PREFIX}/bin/llvm-link" sed -ie "s;protoc-gen-grpc.*$;protoc-gen-grpc=${BUILD_PREFIX}/bin/grpc_cpp_plugin\";g" ../src/arrow/flight/CMakeLists.txt - sed -ie 's;"--with-jemalloc-prefix\=je_arrow_";"--with-jemalloc-prefix\=je_arrow_" "--with-lg-page\=14";g' ../cmake_modules/ThirdpartyToolchain.cmake + sed -ie 's;"--with-jemalloc-prefix\=je_arrow_";"--with-jemalloc-prefix\=je_arrow_" "--with-lg-page\=16";g' ../cmake_modules/ThirdpartyToolchain.cmake fi # disable -fno-plt, which causes problems with GCC on PPC diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 18be3030b..7b43f8805 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,7 +39,7 @@ source: folder: testing build: - number: 29 + number: 30 # for cuda support, building with one version is enough to be compatible with # all later versions, since arrow is only using libcuda, and not libcudart. skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]