Skip to content

Commit

Permalink
Fix krb5 transitive dependency cross build (#5555)
Browse files Browse the repository at this point in the history
* Fix krb5 transitive dependency cross build

* Specify env flags in Cross.toml

* Change fix target to gnu instead of musl

* Remove deprecated Cross configurations

* Fix variable case
  • Loading branch information
rdettai authored Nov 26, 2024
1 parent 0a112fb commit 4ffbd53
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
1 change: 0 additions & 1 deletion .github/actions/cross-build-binary/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ runs:
QW_COMMIT_DATE: ${{ env.QW_COMMIT_DATE }}
QW_COMMIT_HASH: ${{ env.QW_COMMIT_HASH }}
QW_COMMIT_TAGS: ${{ env.QW_COMMIT_TAGS }}

working-directory: ./quickwit
- name: Bundle archive
run: |
Expand Down
11 changes: 9 additions & 2 deletions quickwit/Cross.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@ image = "quickwit/cross:x86_64-unknown-linux-gnu"

[target.x86_64-unknown-linux-musl]
image = "quickwit/cross:x86_64-unknown-linux-musl"
RUSTFLAGS="LIB_LDFLAGS=-L/usr/lib/x86_64-linux-gnu CFLAGS=-I/usr/local/musl/include CC=musl-gcc"

[target.aarch64-unknown-linux-gnu]
image = "quickwit/cross:aarch64-unknown-linux-gnu"

[target.aarch64-unknown-linux-gnu.env]
# Fix build for transitive dependency rdkafka -> rdkafka-sys -> sasl2-sys -> krb5-src
# Introduced by https://github.com/MaterializeInc/rust-krb5-src/pull/27
passthrough = [
"krb5_cv_attr_constructor_destructor=yes",
"ac_cv_func_regcomp=yes",
"ac_cv_printf_positional=yes",
]

[target.aarch64-unknown-linux-musl]
image = "quickwit/cross:aarch64-unknown-linux-musl"
linker = "aarch64-linux-musl-gcc"

0 comments on commit 4ffbd53

Please sign in to comment.