object - use collapse_features and remove rustc-dep-of-std feature.

diff --git a/src/object/debian/changelog b/src/object/debian/changelog
index 11a49d713e28bbde5e508ef2e4c8ccf5abbd9aec..d77f67eafc387ed69ae3bad04bdb20fb2e7aee7f 100644 (file)
--- a/src/object/debian/changelog
+++ b/src/object/debian/changelog
@@ -3,6 +3,9 @@ rust-object (0.20.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
   * Team upload.
   * Package object 0.20.0 from crates.io using debcargo 2.4.4
   * Drop wasm/wasmparser feature.
+  * Drop rustc-dep-of-std feature.
+  * Use collapse_features = true, the extra dependencies are relatively
+    minimal.
 
  -- Peter Michael Green <plugwash@debian.org>  Tue, 02 Nov 2021 00:51:52 +0000
 

diff --git a/src/object/debian/debcargo.toml b/src/object/debian/debcargo.toml
index 10402e93a3f620e73facd7927b39ec00fed9e67c..083fad58b114e8d663048e0848765082f3514696 100644 (file)
--- a/src/object/debian/debcargo.toml
+++ b/src/object/debian/debcargo.toml
@@ -4,5 +4,7 @@ uploaders = [
   "Wolfgang Silbermayr <wolfgang@silbermayr.at>",
 ]
 
+collapse_features = true
+
 # The auto-generated summary is too long.
 summary = "Object file formats parsing interface"

diff --git a/src/object/debian/patches/remove-rustc-dep-of-std.patch b/src/object/debian/patches/remove-rustc-dep-of-std.patch
new file mode 100644 (file)
index 0000000..8febfd1
--- /dev/null
+++ b/src/object/debian/patches/remove-rustc-dep-of-std.patch
@@ -0,0 +1,29 @@
+Index: object/Cargo.toml
+===================================================================
+--- object.orig/Cargo.toml
++++ object/Cargo.toml
+@@ -34,20 +34,11 @@ required-features = ["read", "write"]
+ [[example]]
+ name = "objdump"
+ required-features = ["read"]
+-[dependencies.alloc]
+-version = "1.0.0"
+-optional = true
+-package = "rustc-std-workspace-alloc"
+ 
+ [dependencies.compiler_builtins]
+ version = "0.1.2"
+ optional = true
+ 
+-[dependencies.core]
+-version = "1.0.0"
+-optional = true
+-package = "rustc-std-workspace-core"
+-
+ [dependencies.crc32fast]
+ version = "1.2"
+ optional = true
+@@ -73,3 +64,2 @@ macho = []
+ read_core = []
+-rustc-dep-of-std = ["core", "compiler_builtins", "alloc"]
+ std = []

diff --git a/src/object/debian/patches/series b/src/object/debian/patches/series
index 4aecf0299fa75667a7bc331e1839842165f1135b..3ed10f7500f0b7fb4462571c46960c3adbdb7171 100644 (file)
--- a/src/object/debian/patches/series
+++ b/src/object/debian/patches/series
@@ -1,2 +1,3 @@
 bump-flate2.patch
 remove-wasm-feature.patch
+remove-rustc-dep-of-std.patch