Skip to content

Commit

Permalink
dev-util/sccache: adjust for cargo_src_configure
Browse files Browse the repository at this point in the history
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <[email protected]>
  • Loading branch information
gyakovlev committed Sep 23, 2020
1 parent c9b8daf commit 43d56af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
11 changes: 2 additions & 9 deletions dev-util/sccache/sccache-0.2.13.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,11 @@ src_configure() {
$(usev redis)
$(usev s3)
)
}

src_compile() {
cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
cargo_src_configure --no-default-features
}

src_install() {
cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
cargo_src_install

keepdir /etc/sccache

Expand All @@ -386,10 +383,6 @@ src_install() {
fi
}

src_test() {
cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
}

pkg_postinst() {
ewarn "${PN} is experimental, please use with care"
use memcached && optfeature "memcached backend support" net-misc/memcached
Expand Down
9 changes: 3 additions & 6 deletions dev-util/sccache/sccache-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,11 @@ src_configure() {
$(usev redis)
$(usev s3)
)
}

src_compile() {
cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
cargo_src_configure --no-default-features
}

src_install() {
cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
cargo_src_install

keepdir /etc/sccache

Expand All @@ -84,7 +81,7 @@ src_test() {
if [[ "${PV}" == *9999* ]]; then
ewarn "tests are always broken for ${PV} (require network), skipping"
else
cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
cargo_src_test
fi
}

Expand Down

0 comments on commit 43d56af

Please sign in to comment.