www-client/chromium: sync with upstream

This commit is contained in:
github-actions[bot] 2025-01-17 00:03:22 +00:00 committed by GitHub
parent 987e342c41
commit edcb5c090b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 72 additions and 2872 deletions

View file

@ -1,9 +1,5 @@
DIST chromium-130.0.6723.116-gentoo.tar.xz 4699442864 BLAKE2B 571a012f449b757b6a17309cedb3c5cc7da73dc24b1e352554ab14ded9761ce29c62531e9fcb6c0a2290f89bff0e81f4d2cf39f0984bc5c7fc5e9be8c37bcb59 SHA512 e54beef2b445375cba0b1a290a99f7b41b2b9b965c89c0bb062c99be0825ccf64259440bd2b032bb5b1e46eef15b4a4f66fdaeb9974fcfe6f70d55a49ca47850
DIST chromium-130.0.6723.116-testdata-gentoo.tar.xz 83048 BLAKE2B d95970073cedb9dd5488886c94c0b629a0a15f248e66a409b57be89b52eececf845c3d79f6bde51f4476e927a058ee257bb6d1b3ca0332910660a6e045ccb00d SHA512 0df42b1e8a3c0be8a07d71153a8bc5fdfc59a18d574d8dfd2fd1a3e17ca197e71dfd332c02547e6b456b5037c924dbbecc4551ac1695f36181e3a9cc884ff83b
DIST chromium-131.0.6778.139-linux-testdata.tar.xz 279152856 BLAKE2B 41f96d726ed0be06735d78f8430031b083e46652a3f94e7ef664502564f850975e3a8755963ee61458d47d779a9676452216322026cd891ae0eb85f664e9bd87 SHA512 99b4b08948ad5dcb9ed931b7b7019bcd015dbdc2bd420be1383d662a179c61e260ff94b7038f2f7a086a91bf2f733d973c2f1b45581f883da877946123b7e096 DIST chromium-131.0.6778.139-linux-testdata.tar.xz 279152856 BLAKE2B 41f96d726ed0be06735d78f8430031b083e46652a3f94e7ef664502564f850975e3a8755963ee61458d47d779a9676452216322026cd891ae0eb85f664e9bd87 SHA512 99b4b08948ad5dcb9ed931b7b7019bcd015dbdc2bd420be1383d662a179c61e260ff94b7038f2f7a086a91bf2f733d973c2f1b45581f883da877946123b7e096
DIST chromium-131.0.6778.139-linux.tar.xz 2189495224 BLAKE2B 5e32ffa9de17df58b4017c90dd19b9cf1699c94f2ea1f38890821ef4bc3ed5c558c31cb0d57fb5b00c9bede6a953efc553fd8efa14354fd2314ca6e79bdac27e SHA512 b5aa8045edf483c9c53fe9fc253cd6f62ebef51f2b9dc9d59c225705d68ae7fdd88870fac5162ca7d9d9c4e0e778cdf27e4f9bd93bed8c059e0d1eab5ccac767 DIST chromium-131.0.6778.139-linux.tar.xz 2189495224 BLAKE2B 5e32ffa9de17df58b4017c90dd19b9cf1699c94f2ea1f38890821ef4bc3ed5c558c31cb0d57fb5b00c9bede6a953efc553fd8efa14354fd2314ca6e79bdac27e SHA512 b5aa8045edf483c9c53fe9fc253cd6f62ebef51f2b9dc9d59c225705d68ae7fdd88870fac5162ca7d9d9c4e0e778cdf27e4f9bd93bed8c059e0d1eab5ccac767
DIST chromium-131.0.6778.204-linux-testdata.tar.xz 279220900 BLAKE2B ab46bc825ba4d70696bf4441b22d36d45fb4c492ff234ccd0e26d66f9cc3790634f72dfcd81db299f0e0f77bc209ab24057a29e9937a8aefdca5109cce064eae SHA512 a7d97e216c1cc1f4145912b94b85a1c80ee57504b6792f0399ca5bff6494fc24c9cc846179de313f876d04e864ff79465df84997649c7d26d55b9d2848cb31f3
DIST chromium-131.0.6778.204-linux.tar.xz 2189629432 BLAKE2B 35a254700ff906e5f94b07ee4d577e1e4d356ee35972d03dc7c5cfd282e8e2400bd35548ad0bd1619654634abcaffed83d8bc1267727afee0a4294d1fbb3db77 SHA512 86f9fadfc8f2b46c16783767fd10e84129a65d3d7aa22e40d8adb8125e6b1e30f4fbf32d46d482f12999ab6e3fc5a47938921a7ccc77a43a1112003d8805c823
DIST chromium-131.0.6778.264-linux-testdata.tar.xz 279207424 BLAKE2B c3da4c4e00717ea53ae2fa774bf313b805966ba96ad6c5dbe72cd0b6e50f414023e475026b87b58e8b06dfc6bf9890852ca8a76f3c12004aa5e7f9b84e5cc665 SHA512 fb28a206102a5e85c28e8bd2a2c1077b8dc67edba7633783edf5e3a57b01e402fcd0638f8f0b268c839c3ed74d87d82a3ef52b41e3c1755973c27f9b824c817a DIST chromium-131.0.6778.264-linux-testdata.tar.xz 279207424 BLAKE2B c3da4c4e00717ea53ae2fa774bf313b805966ba96ad6c5dbe72cd0b6e50f414023e475026b87b58e8b06dfc6bf9890852ca8a76f3c12004aa5e7f9b84e5cc665 SHA512 fb28a206102a5e85c28e8bd2a2c1077b8dc67edba7633783edf5e3a57b01e402fcd0638f8f0b268c839c3ed74d87d82a3ef52b41e3c1755973c27f9b824c817a
DIST chromium-131.0.6778.264-linux.tar.xz 2189651292 BLAKE2B aa9277ce7211b253f5f38641eeb7531be9edb7fc97f668a23a931f98d6671d3ebeda1b2e900a117acac9edb432f7a0ceb75e7b545752b642e27288ac44043827 SHA512 63bc7c79589ceffed2d089fec9fffcaa1f0b50aa1929da4b173de838ad13bf9c8c989001978d8f5d8a667a946124f897595a2ee206c5f04d05e5b05460b115a1 DIST chromium-131.0.6778.264-linux.tar.xz 2189651292 BLAKE2B aa9277ce7211b253f5f38641eeb7531be9edb7fc97f668a23a931f98d6671d3ebeda1b2e900a117acac9edb432f7a0ceb75e7b545752b642e27288ac44043827 SHA512 63bc7c79589ceffed2d089fec9fffcaa1f0b50aa1929da4b173de838ad13bf9c8c989001978d8f5d8a667a946124f897595a2ee206c5f04d05e5b05460b115a1
DIST chromium-132.0.6834.83-linux-testdata.tar.xz 299789728 BLAKE2B 043d122ef3ee62012cf55ca2754df932d0e48f08df06b78551cb79ec0c4781a52d5333b02645a981748c2c75928ebc91a21d7caf5e248d94b55fbf6ba4f8c974 SHA512 8122b750f22bb61e257b201bac731975f001a801b626d1ca0b037bc8f6cba34fcd104e47efc48c5122838e8196cdec720fb4a30af8ed0f00eb8943bda67da2d0 DIST chromium-132.0.6834.83-linux-testdata.tar.xz 299789728 BLAKE2B 043d122ef3ee62012cf55ca2754df932d0e48f08df06b78551cb79ec0c4781a52d5333b02645a981748c2c75928ebc91a21d7caf5e248d94b55fbf6ba4f8c974 SHA512 8122b750f22bb61e257b201bac731975f001a801b626d1ca0b037bc8f6cba34fcd104e47efc48c5122838e8196cdec720fb4a30af8ed0f00eb8943bda67da2d0
@ -11,7 +7,7 @@ DIST chromium-132.0.6834.83-linux.tar.xz 2193406712 BLAKE2B 65cd156a97bcb4888ed3
DIST chromium-133.0.6943.6-linux-testdata.tar.xz 299258632 BLAKE2B 55e59061701aa0a2da4822519c3d267bf2d5da99c1b4bfe139423f4c085a9972b648c5ab3e2463ad768f6fd14207b6c1d26c2424af1ccc50144cc4e402265566 SHA512 b099e1136e7c58952a6c0d25904c41c0e929db2fe7124f76f8ee82b8c56ae118ce02b784b7ca898d2f02d2703999f158803988aceeced17d824c6047e8fddc47 DIST chromium-133.0.6943.6-linux-testdata.tar.xz 299258632 BLAKE2B 55e59061701aa0a2da4822519c3d267bf2d5da99c1b4bfe139423f4c085a9972b648c5ab3e2463ad768f6fd14207b6c1d26c2424af1ccc50144cc4e402265566 SHA512 b099e1136e7c58952a6c0d25904c41c0e929db2fe7124f76f8ee82b8c56ae118ce02b784b7ca898d2f02d2703999f158803988aceeced17d824c6047e8fddc47
DIST chromium-133.0.6943.6-linux.tar.xz 2297438504 BLAKE2B 58b09f6e1bde370a1ff02ea94356e9a3e241b205ff63146aa25823023acbd7052d1a05d77c14c796962ccd35fd29c0ee7554906f58b3b3a40dea02115b4cc352 SHA512 e1378af355ae503426af127fd3bfe7d85ff77f8fe66bb3c6f00b38cc872de43566e31e5d2200bc25c721077dae69462d7af5b67bedeaf644819f04f81d55adfe DIST chromium-133.0.6943.6-linux.tar.xz 2297438504 BLAKE2B 58b09f6e1bde370a1ff02ea94356e9a3e241b205ff63146aa25823023acbd7052d1a05d77c14c796962ccd35fd29c0ee7554906f58b3b3a40dea02115b4cc352 SHA512 e1378af355ae503426af127fd3bfe7d85ff77f8fe66bb3c6f00b38cc872de43566e31e5d2200bc25c721077dae69462d7af5b67bedeaf644819f04f81d55adfe
DIST chromium-openpower-a85b64f07b.tar.bz2 387899 BLAKE2B b01fda2d64ce73068d1536a10cc0896f07a4b714cdb25698b1df8b3252baa0c21c4209b307cf1cb554854f6d0bfe3cd35e06aaa8d02ac5d409a119335084c324 SHA512 05eee81677e8766808441c939bee68e2e6c58ec91f471d88a40181d2eda78614a0a6d27d92ff8f9dda564d12f3451bace4ff2727594748c5c238a3533038019b DIST chromium-openpower-a85b64f07b.tar.bz2 387899 BLAKE2B b01fda2d64ce73068d1536a10cc0896f07a4b714cdb25698b1df8b3252baa0c21c4209b307cf1cb554854f6d0bfe3cd35e06aaa8d02ac5d409a119335084c324 SHA512 05eee81677e8766808441c939bee68e2e6c58ec91f471d88a40181d2eda78614a0a6d27d92ff8f9dda564d12f3451bace4ff2727594748c5c238a3533038019b
DIST chromium-patches-130-2.tar.bz2 10151 BLAKE2B b46515a3e01153d8c4e5c3ee1f6e9f905265bf88b698d46c8ceed0f90d36a057b8bb30a860e8d934bf0b85f9c0a671bef2c9a00349228fa076b7aec37ff62ca0 SHA512 e1ecca666c3998ee285426751be3220a5b67a057f2c92b1f45c7b786efb8d0b0e1d49ba70471fa74155f79f22811d240af636f61007191756c9981b53d3b23de DIST chromium-openpower-c11b515d9a.tar.bz2 396039 BLAKE2B c05653e6bb62188c18864e783197853f4c41f88d1c928044a0ea0cb4677bc17806fac266ab100cbbcec3cb0d964bf2172917df95679927c1f1a88fa34aef4f53 SHA512 e9d9bbb2dd8d998060c78dfd5bbaedc548a8c44b442f6259304797326c585046144a6bb8aa4e24c44b3b56068189bee8a01267db2a392e90fd5603d06c0ef9ff
DIST chromium-patches-131-1.tar.bz2 4932 BLAKE2B 72006a6d751ae1207352547cdeef87f8cc9f9639283238da201d879c6fcd0f8bc499669cb030d8b4c2216fcd2730de46b0a071007b3d69a2bbdd22ba38bcd279 SHA512 11d7f861c007e9e28e5192fb354940180aea0e01e6e8ae77547e2dffd7b541b11f1acfe0fd0c8b6b4cbfc6c39ddfa79c8c08db42c1292ad329d49027d1406fc3 DIST chromium-patches-131-1.tar.bz2 4932 BLAKE2B 72006a6d751ae1207352547cdeef87f8cc9f9639283238da201d879c6fcd0f8bc499669cb030d8b4c2216fcd2730de46b0a071007b3d69a2bbdd22ba38bcd279 SHA512 11d7f861c007e9e28e5192fb354940180aea0e01e6e8ae77547e2dffd7b541b11f1acfe0fd0c8b6b4cbfc6c39ddfa79c8c08db42c1292ad329d49027d1406fc3
DIST chromium-patches-132.tar.bz2 5040 BLAKE2B d5bd84dd90b395c6a15135637f51f931c72a2f301b1c24e9b938c744f2767fa36857b8edfdf5c44cf085a1efcb40475401fec226ce43446442f32fb174b55355 SHA512 29833b306a34ab6562ee58eb03669818da7235cd36666b27d829bcbd3c4d0035a530fb6be1c33cf88c1c11d43e68e3781f9b9602c0c004e7a37ffa69f9ee17c7 DIST chromium-patches-132.tar.bz2 5040 BLAKE2B d5bd84dd90b395c6a15135637f51f931c72a2f301b1c24e9b938c744f2767fa36857b8edfdf5c44cf085a1efcb40475401fec226ce43446442f32fb174b55355 SHA512 29833b306a34ab6562ee58eb03669818da7235cd36666b27d829bcbd3c4d0035a530fb6be1c33cf88c1c11d43e68e3781f9b9602c0c004e7a37ffa69f9ee17c7
DIST chromium-patches-133-1.tar.bz2 10661 BLAKE2B c8a141bd10e628533e373b08969f95443eb6ae7f4497359db02f370147ac6132fbc31db28915ebdd9f150c13be78f06af938bd7dffdf2c23d90e1b9e07bd92ab SHA512 48a356872acc41c96c92366bd09de5a1c4af87fe4c480dccc7bd7a2aae5c3be8e6411151ed36303a127022001248bd25ef8305e83bd0d533660e3f11943af686 DIST chromium-patches-133-1.tar.bz2 10661 BLAKE2B c8a141bd10e628533e373b08969f95443eb6ae7f4497359db02f370147ac6132fbc31db28915ebdd9f150c13be78f06af938bd7dffdf2c23d90e1b9e07bd92ab SHA512 48a356872acc41c96c92366bd09de5a1c4af87fe4c480dccc7bd7a2aae5c3be8e6411151ed36303a127022001248bd25ef8305e83bd0d533660e3f11943af686

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
# Copyright 2009-2024 Gentoo Authors # Copyright 2009-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -179,6 +179,9 @@ BDEPEND="
llvm-core/clang:${LLVM_SLOT} llvm-core/clang:${LLVM_SLOT}
llvm-core/llvm:${LLVM_SLOT} llvm-core/llvm:${LLVM_SLOT}
llvm-core/lld:${LLVM_SLOT} llvm-core/lld:${LLVM_SLOT}
official? (
!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
)
') ')
pgo? ( pgo? (
>=dev-python/selenium-3.141.0 >=dev-python/selenium-3.141.0
@ -1090,7 +1093,11 @@ chromium_configure() {
# Allow building against system libraries in official builds # Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py || die tools/generate_shim_headers/generate_shim_headers.py || die
myconf_gn+=" is_cfi=${use_lto}" if use ppc64; then
myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
else
myconf_gn+=" is_cfi=${use_lto}"
fi
# Don't add symbols to build # Don't add symbols to build
myconf_gn+=" symbol_level=0" myconf_gn+=" symbol_level=0"
fi fi

File diff suppressed because it is too large Load diff

View file

@ -179,6 +179,9 @@ BDEPEND="
llvm-core/clang:${LLVM_SLOT} llvm-core/clang:${LLVM_SLOT}
llvm-core/llvm:${LLVM_SLOT} llvm-core/llvm:${LLVM_SLOT}
llvm-core/lld:${LLVM_SLOT} llvm-core/lld:${LLVM_SLOT}
official? (
!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
)
') ')
pgo? ( pgo? (
>=dev-python/selenium-3.141.0 >=dev-python/selenium-3.141.0
@ -1090,7 +1093,11 @@ chromium_configure() {
# Allow building against system libraries in official builds # Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py || die tools/generate_shim_headers/generate_shim_headers.py || die
myconf_gn+=" is_cfi=${use_lto}" if use ppc64; then
myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
else
myconf_gn+=" is_cfi=${use_lto}"
fi
# Don't add symbols to build # Don't add symbols to build
myconf_gn+=" symbol_level=0" myconf_gn+=" symbol_level=0"
fi fi

View file

@ -29,7 +29,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs
DESCRIPTION="Open-source version of Google Chrome web browser" DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="https://www.chromium.org/" HOMEPAGE="https://www.chromium.org/"
PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6" PPC64_HASH="c11b515d9addc3f8b516502e553ace507eb81815"
PATCH_V="${PV%%\.*}" PATCH_V="${PV%%\.*}"
SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz SRC_URI="https://chromium-tarballs.distfiles.gentoo.org/${P}-linux.tar.xz
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2 https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
@ -38,7 +38,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 https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
) )
ppc64? ( 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 )" pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
@ -47,12 +47,12 @@ SLOT="0/stable"
# Dev exists mostly to give devs some breathing room for beta/stable releases; # Dev exists mostly to give devs some breathing room for beta/stable releases;
# it shouldn't be keyworded but adventurous users can select it. # it shouldn't be keyworded but adventurous users can select it.
if [[ ${SLOT} != "0/dev" ]]; then if [[ ${SLOT} != "0/dev" ]]; then
KEYWORDS="~arm64" KEYWORDS="arm64"
fi fi
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd" IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio" IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine" IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
RESTRICT=" RESTRICT="
!bindist? ( bindist ) !bindist? ( bindist )
!test? ( test ) !test? ( test )
@ -178,6 +178,9 @@ BDEPEND="
llvm-core/clang:${LLVM_SLOT} llvm-core/clang:${LLVM_SLOT}
llvm-core/llvm:${LLVM_SLOT} llvm-core/llvm:${LLVM_SLOT}
llvm-core/lld:${LLVM_SLOT} llvm-core/lld:${LLVM_SLOT}
official? (
!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
)
') ')
pgo? ( pgo? (
>=dev-python/selenium-3.141.0 >=dev-python/selenium-3.141.0
@ -364,11 +367,6 @@ src_prepare() {
# Calling this here supports resumption via FEATURES=keepwork # Calling this here supports resumption via FEATURES=keepwork
python_setup python_setup
# disable global media controls, crashes with libstdc++
sed -i -e \
"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
"chrome/browser/media/router/media_router_feature.cc"
local PATCHES=( local PATCHES=(
"${FILESDIR}/chromium-cross-compile.patch" "${FILESDIR}/chromium-cross-compile.patch"
"${FILESDIR}/chromium-109-system-zlib.patch" "${FILESDIR}/chromium-109-system-zlib.patch"
@ -382,23 +380,42 @@ src_prepare() {
PATCHES+=(${FILESDIR}/chromium-001-widevine-support-for-arm.patch) PATCHES+=(${FILESDIR}/chromium-001-widevine-support-for-arm.patch)
fi fi
shopt -s globstar nullglob
# 130: moved the PPC64 patches into the chromium-patches repo
local patch
for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do
if [[ ${patch} == *"ppc64le"* ]]; then
use ppc64 && PATCHES+=( "${patch}" )
else
PATCHES+=( "${patch}" )
fi
done
shopt -u globstar nullglob
PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
# We can't use the bundled compiler builtins with the system toolchain # We can't use the bundled compiler builtins with the system toolchain
# `grep` is a development convenience to ensure we fail early when google changes something. # `grep` is a development convenience to ensure we fail early when google changes something.
local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {" local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {"
grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins" grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn
if use ppc64 ; then if use ppc64; then
local p local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches"
for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do # patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304)
if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
eapply "${WORKDIR}/debian/patches/${p}" local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch"
fi # Apply the OpenPOWER patches (check for page size and isa3.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 done
PATCHES+=( "${WORKDIR}/ppc64le" ) if [[ $(getconf PAGESIZE) == 65536 ]]; then
PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" ) PATCHES+=( "${patchset_dir}/${page_size_patch}" )
fi
# We use vsx3 as a proxy for 'want isa3.0' (POWER9)
if use cpu_flags_ppc_vsx3 ; then
PATCHES+=( +"${patchset_dir}/${isa_3_patch}" )
fi
fi fi
# This is a nightly option that does not exist any current release # This is a nightly option that does not exist any current release
@ -1100,7 +1117,11 @@ chromium_configure() {
# Allow building against system libraries in official builds # Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py || die tools/generate_shim_headers/generate_shim_headers.py || die
myconf_gn+=" is_cfi=${use_lto}" if use ppc64; then
myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
else
myconf_gn+=" is_cfi=${use_lto}"
fi
# Don't add symbols to build # Don't add symbols to build
myconf_gn+=" symbol_level=0" myconf_gn+=" symbol_level=0"
fi fi

View file

@ -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 https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz
) )
ppc64? ( 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 )" pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
@ -187,6 +187,9 @@ BDEPEND="
llvm-core/clang:${LLVM_SLOT} llvm-core/clang:${LLVM_SLOT}
llvm-core/llvm:${LLVM_SLOT} llvm-core/llvm:${LLVM_SLOT}
llvm-core/lld:${LLVM_SLOT} llvm-core/lld:${LLVM_SLOT}
official? (
!ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] )
)
') ')
pgo? ( pgo? (
>=dev-python/selenium-3.141.0 >=dev-python/selenium-3.141.0
@ -410,8 +413,10 @@ src_prepare() {
local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" 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) # 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" local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch"
# Apply the OpenPOWER patches (check for page size) local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch"
openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" || die) ) # 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 for patch in "${openpower_patches[@]}"; do
PATCHES+=( "${patchset_dir}/${patch}" ) PATCHES+=( "${patchset_dir}/${patch}" )
done done
@ -420,7 +425,7 @@ src_prepare() {
fi fi
# We use vsx3 as a proxy for 'want isa3.0' (POWER9) # We use vsx3 as a proxy for 'want isa3.0' (POWER9)
if use cpu_flags_ppc_vsx3 ; then 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
fi fi
@ -1123,7 +1128,11 @@ chromium_configure() {
# Allow building against system libraries in official builds # Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py || die tools/generate_shim_headers/generate_shim_headers.py || die
myconf_gn+=" is_cfi=${use_lto}" if use ppc64; then
myconf_gn+=" is_cfi=no" # requires llvm-runtimes/compiler-rt-sanitizers[cfi]
else
myconf_gn+=" is_cfi=${use_lto}"
fi
# Don't add symbols to build # Don't add symbols to build
myconf_gn+=" symbol_level=0" myconf_gn+=" symbol_level=0"
fi fi