From 2f1a06ebbb4459b6ccb2aa96dc4646c2d67fb216 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 5 Mar 2024 20:46:26 -0500 Subject: [PATCH] dev-util/sccache: make the zstd dependency effective It is needed by the zstd-sys crate, but only if we tell it to use the system copy... Signed-off-by: Eli Schwartz Signed-off-by: Sam James --- .../sccache/{sccache-0.5.4.ebuild => sccache-0.5.4-r1.ebuild} | 3 ++- dev-util/sccache/sccache-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) rename dev-util/sccache/{sccache-0.5.4.ebuild => sccache-0.5.4-r1.ebuild} (99%) diff --git a/dev-util/sccache/sccache-0.5.4.ebuild b/dev-util/sccache/sccache-0.5.4-r1.ebuild similarity index 99% rename from dev-util/sccache/sccache-0.5.4.ebuild rename to dev-util/sccache/sccache-0.5.4-r1.ebuild index eb47216271ca9..97207cbb5aeb6 100644 --- a/dev-util/sccache/sccache-0.5.4.ebuild +++ b/dev-util/sccache/sccache-0.5.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017-2023 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.7 @@ -444,6 +444,7 @@ src_configure() { # Should be able to drop this once we have a 'gentoo' profile sed -i 's/strip = true/strip = false/' Cargo.toml || die + export ZSTD_SYS_USE_PKG_CONFIG=1 myfeatures=( native-zlib $(usev azure) diff --git a/dev-util/sccache/sccache-9999.ebuild b/dev-util/sccache/sccache-9999.ebuild index 2a99e5798f569..ebb46ec79d8d1 100644 --- a/dev-util/sccache/sccache-9999.ebuild +++ b/dev-util/sccache/sccache-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017-2023 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.7 @@ -65,6 +65,7 @@ src_configure() { # Should be able to drop this once we have a 'gentoo' profile sed -i 's/strip = true/strip = false/' Cargo.toml || die + export ZSTD_SYS_USE_PKG_CONFIG=1 myfeatures=( native-zlib $(usev azure)