Skip to content

Commit e71caa9

Browse files
authored
Merge pull request ceph#65935 from tchaikov/wip-debian-libxsimd-dev
debian/control: Add libxsimd-dev build dependency for vendored Arrow Reviewed-by: Casey Bodley <[email protected]>
2 parents 84621df + 929b47f commit e71caa9

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cmake/modules/BuildArrow.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ function(build_arrow)
6969
list(APPEND arrow_DEPENDS Boost)
7070
endif()
7171

72-
# since Arrow 15.0.0 needs xsimd>=8.1.0 and since Ubuntu Jammy
73-
# Jellyfish only provides 7.6.0, we'll have arrow build it as source
74-
list(APPEND arrow_CMAKE_ARGS -Dxsimd_SOURCE=BUNDLED)
72+
# Arrow requires xsimd >= 9.0.1 (see arrow/cpp/thirdparty/versions.txt).
73+
# Use AUTO to let Arrow detect system xsimd and fall back to bundled if needed.
74+
list(APPEND arrow_CMAKE_ARGS -Dxsimd_SOURCE=AUTO)
7575

7676
# cmake doesn't properly handle arguments containing ";", such as
7777
# CMAKE_PREFIX_PATH, for which reason we'll have to use some other separator.

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Build-Depends: automake,
8585
libpmem-dev <pkg.ceph.pmdk>,
8686
libpmemobj-dev (>= 1.8) <pkg.ceph.pmdk>,
8787
libprotobuf-dev <pkg.ceph.crimson>,
88+
libxsimd-dev <!pkg.ceph.arrow>,
8889
ninja-build,
8990
nlohmann-json3-dev,
9091
patch,

0 commit comments

Comments
 (0)