commit: 5f52d9f8e6047c7db41d231fb4dee59880401fe5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jul 15 04:50:33 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 15 04:53:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f52d9f8
www-client/chromium: fix LLVM and Java check We need to do these in pkg_setup instead. Closes: https://bugs.gentoo.org/854981 Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/chromium/chromium-104.0.5112.12.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www-client/chromium/chromium-104.0.5112.12.ebuild b/www-client/chromium/chromium-104.0.5112.12.ebuild index 2e826d7e3f0a..95ec2a48b847 100644 --- a/www-client/chromium/chromium-104.0.5112.12.ebuild +++ b/www-client/chromium/chromium-104.0.5112.12.ebuild @@ -240,7 +240,7 @@ llvm_check_deps() { pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then - ( use lto || use pgo ) && llvm_pkg_setup + [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup local -x CPP="$(tc-getCXX) -E" if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then @@ -256,7 +256,7 @@ pre_build_checks() { die "At least clang 12 is required" fi fi - if use js-type-check; then + if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then "${EPREFIX}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly" fi fi @@ -279,7 +279,7 @@ pre_build_checks() { CHECKREQS_MEMORY="16G" fi fi - check-reqs_pkg_setup + check-reqs_${EBUILD_PHASE_FUNC} } pkg_pretend() {
