Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test cargo changes #13440

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions eclass/cargo.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ _CARGO_ECLASS=1

if [[ ${PV} == *9999* ]]; then
# we need at least this for cargo vendor subommand
CARGO_DEPEND=">=virtual/cargo-1.37.0"
RUST_DEPEND=">=virtual/rust-1.37.0"
else
CARGO_DEPEND="virtual/cargo"
RUST_DEPEND="virtual/rust"
fi

case ${EAPI} in
6) DEPEND="${CARGO_DEPEND}";;
7) BDEPEND="${CARGO_DEPEND}";;
6) DEPEND="${RUST_DEPEND}";;
7) BDEPEND="${RUST_DEPEND}";;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac

Expand Down Expand Up @@ -115,8 +115,8 @@ cargo_live_src_unpack() {
mkdir -p "${S}" || die

pushd "${S}" > /dev/null || die
CARGO_HOME="${ECARGO_HOME}" cargo fetch || die
CARGO_HOME="${ECARGO_HOME}" cargo vendor "${ECARGO_VENDOR}" || die
CARGO_HOME="${ECARGO_HOME}" cargo -vv fetch || die
CARGO_HOME="${ECARGO_HOME}" cargo -vv vendor "${ECARGO_VENDOR}" || die
popd > /dev/null || die

cargo_gen_config
Expand Down Expand Up @@ -146,7 +146,7 @@ cargo_src_compile() {

export CARGO_HOME="${ECARGO_HOME}"

cargo build -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
cargo -vv build -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you imagine to make the -vv optional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, changes coming soon.
default will be verbose though.
but it'll be possible to override it back to quiet.
also NOCOLOR will be supported.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

|| die "cargo build failed"
}

Expand All @@ -156,7 +156,7 @@ cargo_src_compile() {
cargo_src_install() {
debug-print-function ${FUNCNAME} "$@"

cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
cargo -vv install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
|| die "cargo install failed"
rm -f "${D}/usr/.crates.toml"

Expand All @@ -169,7 +169,7 @@ cargo_src_install() {
cargo_src_test() {
debug-print-function ${FUNCNAME} "$@"

cargo test -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
cargo -vv test -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
|| die "cargo test failed"
}

Expand Down
17 changes: 0 additions & 17 deletions virtual/cargo/cargo-1.34.2.ebuild

This file was deleted.

17 changes: 0 additions & 17 deletions virtual/cargo/cargo-1.35.0.ebuild

This file was deleted.

17 changes: 0 additions & 17 deletions virtual/cargo/cargo-1.36.0.ebuild

This file was deleted.

17 changes: 0 additions & 17 deletions virtual/cargo/cargo-1.37.0.ebuild

This file was deleted.

17 changes: 0 additions & 17 deletions virtual/cargo/cargo-1.38.0.ebuild

This file was deleted.

8 changes: 0 additions & 8 deletions virtual/cargo/metadata.xml

This file was deleted.