diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-03-06 06:04:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 06:04:19 +0000 |
| commit | 2d9b97f220926d95d91a187fbce1d61b8c2209c8 (patch) | |
| tree | 5abeae23af3751bafab243b8cb3f69fbf2a9afa6 | |
| parent | 1d6bc9e400d96c2c41049b27ff33283dea0fa5d0 (diff) | |
| parent | 4b10fdff1d8260696cf6a5a55b17c7e23cba7e78 (diff) | |
| download | rust-libzfs-master.zip | |
Merge #107master
107: Workaround for missing libs on freebsd 13 r=jmesmon a=fabiojmendes
This pull request fixes linking issues on downstream libs on FreeBSD 13. See [libzetta-rs #166](https://github.com/Inner-Heaven/libzetta-rs/issues/166) for details.
I also updated the url for grcov binary so the workflows will run.
Hopefully this workaround can be removed once this [issue is fixed](https://github.com/Inner-Heaven/libzetta-rs/issues/166#issuecomment-1057534021) on FreeBSD side.
Co-authored-by: Fabio Mendes <fabiojmendes@gmail.com>
| -rw-r--r-- | .github/workflows/codecov.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/coveralls.yml | 2 | ||||
| -rw-r--r-- | zfs-core-sys/build.rs | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index cd18818..a8e6f2e 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -42,7 +42,7 @@ jobs: RUSTFLAGS: '-Zinstrument-coverage' LLVM_PROFILE_FILE: 'rust-libzfs-%p-%m.profraw' - - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf - + - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf - - run: ./grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info - run: bash <(curl -s https://codecov.io/bash) -f lcov.info - name: Run codacy-coverage-reporter diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml index 1d4782a..b38ec50 100644 --- a/.github/workflows/coveralls.yml +++ b/.github/workflows/coveralls.yml @@ -40,7 +40,7 @@ jobs: CARGO_INCREMENTAL: '0' RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' - - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-linux-x86_64.tar.bz2 | tar jxf - + - run: curl -L https://github.com/mozilla/grcov/releases/latest/download/grcov-x86_64-unknown-linux-gnu.tar.bz2 | tar jxf - - run: zip -0 ccov.zip `find . \( -name "*.gc*" \) -print` - run: ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" -o lcov.info - name: Archive code coverage results diff --git a/zfs-core-sys/build.rs b/zfs-core-sys/build.rs index cdce9e9..e82f09d 100644 --- a/zfs-core-sys/build.rs +++ b/zfs-core-sys/build.rs @@ -114,5 +114,6 @@ fn main() { println!("cargo:rustc-link-lib=nvpair"); if target_os == "freebsd" { println!("cargo:rustc-link-lib=dylib:-as-needed=zutil"); + println!("cargo:rustc-link-lib=dylib:-as-needed=spl"); } } |