diff options
| author |   Stephan Hartmann <sultan@gentoo.org> | 2022-05-29 20:12:33 +0200 |
|---|---|---|
| committer | Stephan Hartmann <sultan@gentoo.org> | 2022-05-29 20:12:33 +0200 |
| commit | ec73063e84d24d8c5941dacbdfec4af6d0d87387 (patch) | |
| tree | ad59c60f02569bb913572002e352beb434eb557b /www-client/chromium | |
| parent | profiles/base: mask >=www-client/chromium-104[pgo] (diff) | |
| download | gentoo-ec73063e84d24d8c5941dacbdfec4af6d0d87387.tar.gz gentoo-ec73063e84d24d8c5941dacbdfec4af6d0d87387.tar.bz2 gentoo-ec73063e84d24d8c5941dacbdfec4af6d0d87387.zip | |
www-client/chromium: add missing || die, re-add arm64 fix
Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/chromium-104.0.5083.0.ebuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/www-client/chromium/chromium-104.0.5083.0.ebuild b/www-client/chromium/chromium-104.0.5083.0.ebuild index f4c991f52087..a85c25029430 100644 --- a/www-client/chromium/chromium-104.0.5083.0.ebuild +++ b/www-client/chromium/chromium-104.0.5083.0.ebuild @@ -918,6 +918,11 @@ chromium_configure() { myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")" fi + # Results in undefined references in chrome linking, may require CFI to work + if use arm64; then + myconf_gn+=" arm_control_flow_integrity=\"none\"" + fi + # Enable official builds myconf_gn+=" is_official_build=$(usex official true false)" myconf_gn+=" use_thin_lto=$(usex lto true false)" @@ -1016,21 +1021,21 @@ src_compile() { chromium_compile virtx chromium_profile "$profdata" - touch "${WORKDIR}/.pgo-profiled" + touch "${WORKDIR}/.pgo-profiled" || die fi if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then # Remove phase 1 output - rm -rf out/Release + rm -r out/Release || die chromium_configure 2 "$profdata" - touch "${WORKDIR}/.pgo-phase-2-configured" + touch "${WORKDIR}/.pgo-phase-2-configured" || die fi if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then chromium_compile - touch "${WORKDIR}/.pgo-phase-2-compiled" + touch "${WORKDIR}/.pgo-phase-2-compiled" || die fi else chromium_compile |