commit:     2f1a06ebbb4459b6ccb2aa96dc4646c2d67fb216
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 01:46:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 03:36:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1a06eb

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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/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(-)

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 eb47216271ca..97207cbb5aeb 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 2a99e5798f56..ebb46ec79d8d 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)

Reply via email to