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") { lass='form'>
path: root/tests/guix-pack.sh
AgeCommit message (Expand)Author
2022-02-18profiles: 'profile-derivation' rejects unsupported packages....Previously user-facing commands would happily start building packages even if they do not support that system. With this change, all the user-facing commands reject unsupported packages without going further. * guix/profiles.scm (profile-derivation): Add #:allow-unsupported-packages?. Define 'check-supported-packages' and honor #:allow-unsupported-packages?. * tests/guix-pack.sh, tests/guix-package.sh, tests/guix-shell.sh: Ensure that unsupported packages are rejected. * tests/guix-system.sh: Pass "--system=armhf-linux" when attempting to build gnu/system/examples/asus-c201.tmpl. Ludovic Courtès
2020-09-28tests: Simplify shell exit status negation;...* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-lint.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh: Use the shell '!' keyword to negate command exit status in place of 'if ...; then false; else true; fi' Eric Bavier
2020-05-14store: 'mapm/accumulate-builds' preserves '%current-target-system'....Fixes <https://bugs.gnu.org/41182>. * guix/store.scm (mapm/accumulate-builds): Pass #:system and #:target to 'run-with-store'. * tests/store.scm ("mapm/accumulate-builds, %current-target-system"): New test. * tests/guix-pack.sh: Add 'guix pack -d --target' test. Ludovic Courtès
2020-03-31pack: Adjust test to '--dry-run' changes....This is a followup to 131f50cdc9dbb7183023f4dae759876a9e700bef. * tests/guix-pack.sh: Use '--no-grafts' in conjunction with '-n' and '-d'. Ludovic Courtès
2019-11-22pack: Allow multiple '--manifest' options....* guix/scripts/pack.scm (guix-pack): Collect 'manifest' options, and concatenate the resulting manifests. * tests/guix-pack.sh: Test it. * doc/guix.texi (Invoking guix pack): Document it. Ludovic Courtès
2019-11-21pack: Add "--derivation"....* guix/scripts/pack.scm (%options, show-help): Add "--derivation". (guix-pack): Honor it. * tests/guix-pack.sh: Test it. * doc/guix.texi (Invoking guix pack): Document it. Ludovic Courtès