Skip to content

Commit

Permalink
Workaround for linker error due to space in Arrow install path
Browse files Browse the repository at this point in the history
  • Loading branch information
adamreeve committed May 13, 2024
1 parent 182abb6 commit 2316de9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ jobs:
ARROW_FLIGHT: OFF
ARROW_FLIGHT_SQL: OFF
ARROW_HDFS: OFF
ARROW_HOME: /usr
ARROW_HOME: "${{ github.workspace }}/dist"
ARROW_JEMALLOC: OFF
ARROW_MIMALLOC: ON
ARROW_ORC: OFF
Expand All @@ -342,7 +342,7 @@ jobs:
CMAKE_CXX_STANDARD: "17"
CMAKE_GENERATOR: Ninja
CMAKE_INSTALL_LIBDIR: bin
CMAKE_INSTALL_PREFIX: /usr
CMAKE_INSTALL_PREFIX: "${{ github.workspace }}/dist"
CMAKE_UNITY_BUILD: ON
steps:
- name: Disable Crash Dialogs
Expand Down
6 changes: 6 additions & 0 deletions ci/scripts/c_glib_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ build_root=${2}
: ${BUILD_DOCS_C_GLIB:=OFF}
with_doc=$([ "${BUILD_DOCS_C_GLIB}" == "ON" ] && echo "true" || echo "false")


if [ -n "${MSYSTEM:-}" ]; then
# Fix ARROW_HOME when running under MSYS2
export ARROW_HOME="$(cygpath --unix "${ARROW_HOME}")"
fi

meson_pkg_config_path="${ARROW_HOME}/lib/pkgconfig:${ARROW_HOME}/bin/pkgconfig"

export CFLAGS="-DARROW_NO_DEPRECATED_API"
Expand Down

0 comments on commit 2316de9

Please sign in to comment.