Subject: nettle-sys: clear out "vendored" feature cruft from build.rs
From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor <dkg@fifthhorseman.net>

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") {
051945ab08030169228556cc2a4a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/ld-wrapper.in'>
<input type='hidden' name='id' value='387b86ff003b051945ab08030169228556cc2a4a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=387b86ff003b051945ab08030169228556cc2a4a'>root</a>/<a href='/guix/log/gnu?id=387b86ff003b051945ab08030169228556cc2a4a'>gnu</a>/<a href='/guix/log/gnu/packages?id=387b86ff003b051945ab08030169228556cc2a4a'>packages</a>/<a href='/guix/log/gnu/packages/ld-wrapper.in?id=387b86ff003b051945ab08030169228556cc2a4a'>ld-wrapper.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/ld-wrapper.in?id=387b86ff003b051945ab08030169228556cc2a4a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-25 14:50:02 +0200'>2020-09-25</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=a83860cd22ec68d3910c3d4ab05107452b080858'>gnu: ld-wrapper: Unset 'GUILE_SYSTEM_COMPILED_PATH'.</a><span class='msg-avail'>...<span class='msg-tooltip'>'GUILE_SYSTEM_COMPILED_PATH' is set by guile-bootstrap@2.0.  Unsetting
it ensures it does not interfere.

* gnu/packages/ld-wrapper.in: Unset GUILE_SYSTEM_COMPILED_PATH.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-05 23:36:06 +0100'>2020-03-05</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=feb8c5dac30294d72205ee21b3afcf1cf7a04675'>gnu: ld-wrapper: Add support for quoted arguments in response files.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ld-wrapper.in (expand-arguments): Add TOKENIZE procedure, and
use that to parse the response file.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-29 17:58:16 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=d0a2db47fb550d684c47a0ae3b541a9a71727d9e'>ld-wrapper: Allow linking with non-store libraries by default.</a><span class='msg-avail'>...<span class='msg-tooltip'>This was suggested on several occasions, notably
&lt;https://bugs.gnu.org/24544&gt;.

* gnu/packages/ld-wrapper.in (%allow-impurities?): Default to #t and
parse the value of 'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'.
* guix/build/gnu-build-system.scm (set-paths): Set
'GUIX_LD_WRAPPER_ALLOW_IMPURITIES'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-29 17:58:16 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=1a5e07c3b56049d45be15e3f1ffbe81f2f1809ba'>ld-wrapper: Don't talk about "impure library".</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ld-wrapper.in (rpath-arguments): Clarify message instead
of saying "impure library".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-29 17:58:16 +0200'>2018-03-29</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=6764538327a3ff24bc83ef731e9e74a9160981e2'>ld-wrapper: Make sure debugging output goes through.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/ld-wrapper.in (ld-wrapper): Add call to 'force-output'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-25 14:34:18 +0200'>2017-05-25</span></td><td><a href='/guix/commit/gnu/packages/ld-wrapper.in?id=696487d665a616dfdd09272a7bff0bea0e19375d'>ld-wrapper: Read arguments from "response files".</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/25882&gt;.
Reported by Federico Beffa &lt;beffa@fbengineering.ch&gt;.

* gnu/packages/ld-wrapper.in (expand-arguments): New procedure.
(ld-wrapper): Use it.
</span></span></td><td>Ludovic Courtès</td></tr>