nettle-sys: import upstream 2.0.8
- upstream dropped "vendored" misfeature
- tune drop-vcpkg.diff workaround for 984627
Daniel Kahn Gillmor
2 years ago
|
0 |
rust-nettle-sys (2.0.8-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
|
|
1 |
|
|
2 |
* Package nettle-sys 2.0.8 from crates.io using debcargo 2.4.4
|
|
3 |
|
|
4 |
-- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Tue, 17 Aug 2021 11:27:11 -0400
|
|
5 |
|
| 0 | 6 |
rust-nettle-sys (2.0.5-1) unstable; urgency=medium
|
| 1 | 7 |
|
| 2 | 8 |
* Package nettle-sys 2.0.5 from crates.io using debcargo 2.4.4
|
src/nettle-sys/debian/patches/disable-vendor.diff
less
more
| 0 | |
--- a/Cargo.toml
|
| 1 | |
+++ b/Cargo.toml
|
| 2 | |
@@ -30,14 +30,11 @@
|
| 3 | |
version = ">= 0.53.1, < 0.56"
|
| 4 | |
default-features = false
|
| 5 | |
|
| 6 | |
-[build-dependencies.nettle-src]
|
| 7 | |
-version = "3.5.1-0"
|
| 8 | |
-optional = true
|
| 9 | |
-
|
| 10 | |
[build-dependencies.pkg-config]
|
| 11 | |
version = "0.3"
|
| 12 | |
|
| 13 | |
[features]
|
| 14 | |
vendored = ["nettle-src"]
|
| 15 | |
+nettle-src = []
|
| 16 | |
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
|
| 17 | |
version = "0.2.9"
|
| 18 | |
--- a/build.rs
|
| 19 | |
+++ b/build.rs
|
| 20 | |
@@ -62,13 +62,6 @@
|
| 21 | |
println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
|
| 22 | |
println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
|
| 23 | |
|
| 24 | |
- #[cfg(feature = "vendored")]
|
| 25 | |
- {
|
| 26 | |
- let artifacts = nettle_src::Build::new().build();
|
| 27 | |
- println!("cargo:vendored=1");
|
| 28 | |
- env::set_var("PKG_CONFIG_PATH", artifacts.lib_dir().join("pkgconfig"));
|
| 29 | |
- }
|
| 30 | |
-
|
| 31 | |
let include_paths = try_vcpkg().or_else(try_pkg_config).unwrap();
|
| 32 | |
|
| 33 | |
let out_path = Path::new(&env::var("OUT_DIR").unwrap()).join("bindings.rs");
|
|
0 |
Description: this is a workaround for https://bugs.debian.org/984627
|
|
1 |
|
| 0 | 2 |
--- a/Cargo.toml
|
| 1 | 3 |
+++ b/Cargo.toml
|
| 2 | |
@@ -36,5 +36,3 @@
|
| 3 | |
[features]
|
| 4 | |
vendored = ["nettle-src"]
|
| 5 | |
nettle-src = []
|
|
4 |
@@ -34,5 +34,3 @@
|
|
5 |
|
|
6 |
[build-dependencies.pkg-config]
|
|
7 |
version = "0.3"
|
| 6 | 8 |
-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
|
| 7 | 9 |
-version = "0.2.9"
|
| 8 | 10 |
--- a/build.rs
|
| 9 | 11 |
+++ b/build.rs
|
| 10 | |
@@ -3,22 +3,6 @@
|
| 11 | |
use std::path::{Path, PathBuf};
|
|
12 |
@@ -4,16 +4,6 @@
|
| 12 | 13 |
|
|
14 |
type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
|
| 13 | 15 |
|
| 14 | |
-#[cfg(all(target_env = "msvc", not(feature = "vendored")))]
|
| 15 | |
-fn try_vcpkg() -> Option<Vec<PathBuf>> {
|
|
16 |
-#[cfg(target_env = "msvc")]
|
|
17 |
-fn try_vcpkg() -> Result<Vec<PathBuf>> {
|
| 16 | 18 |
- let lib = vcpkg::Config::new()
|
| 17 | 19 |
- .emit_includes(true)
|
| 18 | |
- .find_package("nettle");
|
|
20 |
- .find_package("nettle")?;
|
| 19 | 21 |
-
|
| 20 | |
- match lib {
|
| 21 | |
- Ok(lib) => Some(lib.include_paths),
|
| 22 | |
- Err(e) => {
|
| 23 | |
- println!("note: vcpkg did not find openssl: {}", e);
|
| 24 | |
- None
|
| 25 | |
- }
|
| 26 | |
- }
|
|
22 |
- Ok(lib.include_paths)
|
| 27 | 23 |
-}
|
| 28 | 24 |
-
|
| 29 | |
-#[cfg(any(not(target_env = "msvc"), feature = "vendored"))]
|
| 30 | |
fn try_vcpkg() -> Option<Vec<PathBuf>> { None }
|
|
25 |
-#[cfg(not(target_env = "msvc"))]
|
|
26 |
fn try_vcpkg() -> Result<Vec<PathBuf>> { Err("not applicable")?; unreachable!() }
|
| 31 | 27 |
|
| 32 | 28 |
fn print_library(lib: &pkg_config::Library, mode: &str) {
|
| 0 | |
disable-vendor.diff
|
| 1 | 0 |
drop-vcpkg.diff
|