From 0986812e146eee42af98b2ad186e49dc135ecb9f Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Mon, 3 Jun 2024 01:27:07 -0400 Subject: trying to fix sys-block/thin-provisioning-tools --- ...thin-provisioning-tools-1.0.10-stdsimd-fix.patch | 16 ++++++++++++++++ ...-provisioning-tools-1.0.6-build-with-cargo.patch | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.10-stdsimd-fix.patch create mode 100644 sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.6-build-with-cargo.patch (limited to 'sys-block/thin-provisioning-tools/files') diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.10-stdsimd-fix.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.10-stdsimd-fix.patch new file mode 100644 index 0000000..0c45e58 --- /dev/null +++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.10-stdsimd-fix.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index cc06e8a..ca9a311 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -129,9 +129,9 @@ dependencies = [ + + [[package]] + name = "crc32c" +-version = "0.6.4" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" ++checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" + dependencies = [ + "rustc_version", + ] diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.6-build-with-cargo.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.6-build-with-cargo.patch new file mode 100644 index 0000000..5e06583 --- /dev/null +++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-1.0.6-build-with-cargo.patch @@ -0,0 +1,21 @@ +For USE=debug to work, portage needs to run cargo_src_compile(), but if `emake` +is used in src_install(), it will trigger a rebuild without debug. If +cargo_src_install() is used instead, manpages and symlinks won't be installed +and the binary would have to be moved since there's no way to make cargo install +to /usr/sbin. So remove $(PDATA_TOOLS) dependency in Makefile instead. Might as +well patch out $(STRIP) too. + +--- a/Makefile ++++ b/Makefile +@@ -56,10 +56,9 @@ + + MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) + +-install: $(PDATA_TOOLS) $(MANPAGES) ++install: $(MANPAGES) + $(INSTALL_DIR) $(BINDIR) + $(INSTALL_PROGRAM) $(PDATA_TOOLS) $(BINDIR) +- $(STRIP) $(BINDIR)/pdata_tools + ln -s -f pdata_tools $(BINDIR)/cache_check + ln -s -f pdata_tools $(BINDIR)/cache_dump + ln -s -f pdata_tools $(BINDIR)/cache_metadata_size -- cgit v1.2.3