commit: e16dae06c50773525f42c6617a4fdfb69d6b8598 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Thu Jan 16 07:25:44 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Thu Jan 16 08:00:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16dae06
www-client/chromium: M133: sync ppc64 codepath with M132 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/chromium/chromium-133.0.6943.6.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www-client/chromium/chromium-133.0.6943.6.ebuild b/www-client/chromium/chromium-133.0.6943.6.ebuild index d52caeb0683f..73e6948b0e85 100644 --- a/www-client/chromium/chromium-133.0.6943.6.ebuild +++ b/www-client/chromium/chromium-133.0.6943.6.ebuild @@ -47,7 +47,7 @@ SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz ) ppc64? ( - https://gitlab.solidsilicon.io/public-development/open-source/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2 + https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2 ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" @@ -408,8 +408,10 @@ src_prepare() { local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" # patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304) local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch" - # Apply the OpenPOWER patches (check for page size) - openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" || die) ) + local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch" + # Apply the OpenPOWER patches (check for page size and isa 3.0) + openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" | + grep -v "${isa_3_patch}" || die) ) for patch in "${openpower_patches[@]}"; do PATCHES+=( "${patchset_dir}/${patch}" ) done @@ -418,7 +420,7 @@ src_prepare() { fi # We use vsx3 as a proxy for 'want isa3.0' (POWER9) if use cpu_flags_ppc_vsx3 ; then - PATCHES+=( "${patchset_dir}/ppc64le/core/baseline-isa-3-0.patch" ) + PATCHES+=( +"${patchset_dir}/${isa_3_patch}" ) fi fi
