Skip to content

Commit

Permalink
xsimd - fix apache-arrow FTBFS by putting cmake files in -dev package.
Browse files Browse the repository at this point in the history
xsimd changed where it put its cmake files in version 13.1.0
(from /usr/lib/cmake to /usr/share/cmake). The new location
meant that cmake files were left in xsimd rather than xsimd-dev.

apache-arrow only lists xsimd-dev and thus it's cmake build
did not find xsimd.

The fix here is to get the files into xsimd-dev.

See chainguard-dev/melange#1693 for
a pipeline fix.  After that lands, the change here could be
backed out.
  • Loading branch information
smoser committed Dec 11, 2024
1 parent b9234cb commit 056bcfb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions apache-arrow.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: apache-arrow
version: 18.1.0
epoch: 0
epoch: 1
description: "multi-language toolbox for accelerated data interchange and in-memory processing"
copyright:
- license: Apache-2.0
Expand All @@ -15,7 +15,7 @@ data:
3.10: '310'
3.11: '311'
3.12: '312'
3.13: '300'
3.13: '313'

environment:
contents:
Expand Down
10 changes: 9 additions & 1 deletion xsimd.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: xsimd
version: 13.1.0
epoch: 0
epoch: 1
description: "C++ wrappers for SIMD intrinsics and parallelized, optimized mathematical functions (SSE, AVX, NEON, AVX512)"
copyright:
- license: "BSD-3-Clause"
Expand Down Expand Up @@ -41,6 +41,14 @@ subpackages:
description: "C++ wrappers for SIMD intrinsics and parallelized, optimized mathematical functions (SSE, AVX, NEON, AVX512) (development files)"
pipeline:
- uses: split/dev
- runs: |
# split/dev does not currently grab cmake files in /usr/share/cmake
# https://github.com/chainguard-dev/melange/pull/1693
if [ -d "${{targets.destdir}}/usr/share/cmake/xsimd" ]; then
mkdir -p "${{targets.contextdir}}/usr/share/cmake"
mv "${{targets.destdir}}/usr/share/cmake/xsimd" \
"${{targets.contextdir}}/usr/share/cmake/"
fi
test:
pipeline:
- uses: test/pkgconf
Expand Down

0 comments on commit 056bcfb

Please sign in to comment.