Skip to content

Commit f3af532

Browse files
committed
Fix patches
1 parent 411d0c8 commit f3af532

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

repos/patches/proxmox-backup/cargo-config-static.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
diff --git a/debian/rules b/debian/rules
2-
index 62089b38..523fd014 100755
2+
index ab48cce1..0d26eab9 100755
33
--- a/debian/rules
44
+++ b/debian/rules
5-
@@ -38,7 +38,7 @@ endif
5+
@@ -37,9 +37,9 @@ endif
66
override_dh_auto_configure:
77
@perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \
88
die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml
99
- $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
1010
+ #$(CARGO) prepare-debian --help $(CURDIR)/debian/cargo_registry --link-from-system
1111
# add a new config for static building, sync with Makefile!
12-
cp $(CARGO_HOME)/config.toml debian/cargo_home/config.static.toml
12+
- cp debian/cargo_home/config.toml debian/cargo_home/config.static.toml
13+
+ touch $(CARGO_HOME)/config.toml; cp $(CARGO_HOME)/config.toml debian/cargo_home/config.static.toml
1314
sed -ri -e 's!^(rustflags = .*)\]$$!\1, "-C", "target-feature=+crt-static", "-L", "$(STATIC_COMPILEDIR)/deps-stubs/"\]!' debian/cargo_home/config.static.toml
15+
# `cargo build` and `cargo install` have different config precedence, symlink
16+
# the wrapper config into a place where `build` picks it up as well..

0 commit comments

Comments
 (0)