Skip to content

Commit

Permalink
ensure arrow uses bundled sources
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjakubowski committed Oct 10, 2024
1 parent 2e31d62 commit b36d629
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 1 addition & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,14 @@ requirements:
# external projects. On windows, though, having git in the build
# requirements causes conda-build to hang when cloning perspective's git
# source, seems to be a conda-build bug.
# Fortuantely the CI pipeline still passes on Windows without the dep. For
# Fortunately the CI pipeline still passes on Windows without the dep. For
# local Windows builds, install git in the base system.
- git # [not win]
- cmake
- make
- pnpm
- pkg-config
- libprotobuf # for protoc
# Shouldn't need this b/c perspective disables ARROW_SIMD_LEVEL and
# ARROW_RUNTIME_SIMD_LEVEL in arrow build. Funny thing is: without this
# package, the build fails -- can't find Findxsimd.cmake. But if you
# immediately try rebuilding, it will then succeed, without xsimd on the
# system. Bewitching cmake cache behavior?
- xsimd
host:
- python
- pip
Expand Down
4 changes: 2 additions & 2 deletions recipe/patches/fix_arrow.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ index 29f0be177..f79514cd9 100644
psp_build_dep("lz4" "${PSP_CMAKE_MODULE_PATH}/lz4.txt.in")

# Build minimal arrow itself
+# Arrow detects conda and seeks dependencies that way. We want it to use our bundled lz4
+set(ARROW_DEPENDENCY_SOURCE "AUTO")
+# Arrow detects conda and seeks dependencies that way. FIXME finish comment
+set(ARROW_DEPENDENCY_SOURCE "BUNDLED" CACHE STRING "forgive me" FORCE)
psp_build_dep("arrow" "${PSP_CMAKE_MODULE_PATH}/arrow.txt.in")

if(PSP_PYTHON_BUILD AND NOT PSP_PYODIDE)

0 comments on commit b36d629

Please sign in to comment.