diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-18 00:10:02 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-18 00:10:02 +0100 |
| commit | ccaccfe4f1da8c11d9fa110f6e4eb847358769d7 (patch) | |
| tree | ff02c95ae3d9a1e73e2a182e268161743d81a88b /eclass | |
| parent | 74e526c590f52d24a213e25f77858ae0b34ec2c8 (diff) | |
gentoo auto-resync : 18:06:2024 - 00:10:02
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39091 -> 39079 bytes | |||
| -rw-r--r-- | eclass/cargo.eclass | 12 | ||||
| -rw-r--r-- | eclass/ecm.eclass | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 96bf94833186..534229d6e72b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 40d98211ce7f..7db34efb4e17 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -48,7 +48,7 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # @PRE_INHERIT # @DESCRIPTION: # Bash string containing all crates that are to be downloaded. -# It is used by cargo_crate_uris. +# It is used by cargo_crate_uris. Typically generated by app-portage/pycargoebuild. # # Ideally, crate names and versions should be separated by a `@` # character. A legacy syntax using hyphen is also supported but it is @@ -319,6 +319,16 @@ _cargo_gen_git_config() { fi } +# @FUNCTION: cargo_target_dir +# @DESCRIPTION: +# Return the directory within target that contains the build, e.g. +# target/aarch64-unknown-linux-gnu/release. +cargo_target_dir() { + local abi + tc-is-cross-compiler && abi=/$(rust_abi) + echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)" +} + # @FUNCTION: cargo_src_unpack # @DESCRIPTION: # Unpacks the package and the cargo registry. diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 518f913815be..3d3b9328269d 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -307,7 +307,7 @@ unset COMMONDEPEND # @DESCRIPTION: # Determine if the current GCC version is acceptable, otherwise die. _ecm_check_gcc_version() { - if [[ ${MERGE_TYPE} != binary && -v ${KDE_GCC_MINIMAL} ]] && tc-is-gcc; then + if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then local version=$(gcc-version) |