Subject: nettle-sys: clear out "vendored" feature cruft from build.rs From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5 https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/ --- a/Cargo.toml 2019-10-23 13:08:07.000000000 -0400 +++ b/Cargo.toml 2019-10-23 14:08:46.644064014 -0400 @@ -29,12 +29,9 @@ version = "0.51.1" default-features = false -[build-dependencies.nettle-src] -version = "3.5.1-0" -optional = true - [build-dependencies.pkg-config] version = "0.3" [features] vendored = ["nettle-src"] +nettle-src = [] diff --git a/build.rs b/build.rs index 44f7af3..ede4b2f 100644 --- a/build.rs +++ b/build.rs @@ -1,7 +1,5 @@ extern crate bindgen; extern crate pkg_config; -#[cfg(feature = "vendored")] -extern crate nettle_src; use std::env; use std::fs; @@ -36,14 +34,6 @@ fn main() { println!("cargo:rerun-if-env-changed=NETTLE_STATIC"); println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS); - #[cfg(feature = "vendored")] - { - let artifacts = nettle_src::Build::new().build(); - println!("cargo:vendored=1"); - env::set_var("PKG_CONFIG_PATH", - artifacts.lib_dir().join("pkgconfig")); - } - let nettle = pkg_config::probe_library("nettle hogweed").unwrap(); let mode = match env::var_os("NETTLE_STATIC") { a>
path: root/tests/guix-system.sh
AgeCommit message (Expand)Author
2024-06-13tests: Adjust ‘guix system’ test for EFI bootloader....This is a followup to e5078ff3210f4a9863b641a60430b2cb3c9c15ee, which broke this test: $ guix system disk-image -n gnu/system/examples/desktop.tmpl guix system: warning: 'disk-image' is deprecated: use 'image' instead guix system: error: EFI bootloader required with GPT partitioning * tests/guix-system.sh: Use ‘guix system image’ instead of ‘guix system disk-image’. Pass ‘-t efi-raw’ for ‘desktop.tmpl’. Change-Id: I6877085ab33d9e8b471315b806fed22a7d1241a3 Ludovic Courtès
2023-10-21tests: Verify plasma.tmpl at x86_64-linux....Some architectures (like riscv64) do no support some of the KDE packages, so just test this example on x86_64-linux. * tests/guix-system.sh: Verify plasma.tmpl to test build it at x86_64-linux. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Zheng Junjie
2023-04-21tests: Fix checks for expected failures....Addresses <https://issues.guix.gnu.org/62406>. With 'set -e', a return status inverted with '!' does not cause the shell to exit immediately. Instead use '&& false' to indicate an expected failure. * tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment-container.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh, tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with '... && false' or `test ! ...` as appropriate. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Eric Bavier
2023-04-18tests: guix-system: Drop the i686-linux desktop image test....Desktop these days means having Rust support (GNOME), which i686 currently lacks on Guix. * tests/guix-system.sh: Do not attempt to build the desktop.tmpl image for i686-linux. Maxim Cournoyer
2022-12-04tests: Fix guix-system.sh test....The regression was introduce with commit c7793b82efd3383a9f7adf0dfa82d71ee032e41b ("gnu: raspberry-pi: Add a bootloader-chain for the Raspberry Pi and os examples.") due to the examples needing to be built for the aarch64-linux system. * tests/guix-system.sh: Invoke guix system build with '--system=aarch64-linux' to build the Raspberry Pi systems. Maxim Cournoyer
2022-10-07tests: Attempt to build 'desktop.tmpl' on all major architectures....Partly fixes <https://issues.guix.gnu.org/58352>. * tests/guix-system.sh: Try to build 'desktop.tmpl' for x86_64, i686, and aarch64. Ludovic Courtès
2022-09-04guix system: Do not use 'vm-image.tmpl' in tests....This is a followup to 95a03aa5c507d48e2cde19ea007b8f90a4e0108a. Since that commit, merely evaluating 'vm-image.tmpl' would trigger the build of 'current-guix' so skip it. * tests/guix-system.sh: Do not try to build 'vm-image.tmpl'. Ludovic Courtès