| 1 |
commit: 325700b86084f7a4b8eed199647413663322cbfb |
| 2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 29 11:13:05 2021 +0000 |
| 4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 29 11:14:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325700b8 |
| 7 |
|
| 8 |
www-client/chromium: fix build on arm64 for stable |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/792288 |
| 11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 12 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
| 13 |
|
| 14 |
www-client/chromium/Manifest | 3 ++- |
| 15 |
www-client/chromium/chromium-91.0.4472.77.ebuild | 16 ++++++++++++++-- |
| 16 |
2 files changed, 16 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 19 |
index 6840222c394..f54703ccc84 100644 |
| 20 |
--- a/www-client/chromium/Manifest |
| 21 |
+++ b/www-client/chromium/Manifest |
| 22 |
@@ -1,8 +1,9 @@ |
| 23 |
DIST chromium-90-patchset-7.tar.xz 3892 BLAKE2B 3ba169baaaf74b548749be3f845f505256cc9573f798e10929b5d1f0f534d739e657e3fa134c78ec3f7987a3b89adfc4bee0d1a6585ad8fe4bdc3ffd1181042c SHA512 5e1aa834ee5668ee40fc3af5cda7325da710dd1a0dea7ce535e89e36fd7d321db63d520a9b6ce6372ed941473dff18d1276316567af810c18e1478a04d3f23f8 |
| 24 |
DIST chromium-90.0.4430.212.tar.xz 917430448 BLAKE2B dbea5515a62c3f3a12596da6d77cad106d377ddda8956da81b8fe8c0c1e3bfa90ba82bca8c1c4fd95282ee0c00a5f3f5206a05728043eb967395a8cf8bda960d SHA512 7cd300d22725e3457b9e3347fb34d6f5728c91aa178d6960d4243bc80122c446890c2276334a01f9c81a43479339e9e266c3bbb040081a22c521b3c4250850f5 |
| 25 |
-DIST chromium-91-patchset-5.tar.xz 3648 BLAKE2B 6c8636f63dc857886d09c8ed69b4c61adc627d2280decdf03b548be8ff2cb522ef0def7a240d1c3c9ee71920304a43af571e2146e2828b89c3b6f87373b8c4a1 SHA512 1554feec958291ad3140e2685683befe4b6e0b0ab6a8694c0e02d5b4bf4b7fcad410f17e72099653456fd95ed24a732dd28f2dcfaf146eb3bf68052e2342a481 |
| 26 |
+DIST chromium-91-patchset-6.tar.xz 4280 BLAKE2B 18887953453133589cfc5df58d24725047235fac3652cc7af7bd117fbc94aa9a2e1b1dd3147f772f84d8fa3e7b5b77159abc1e408d7b24b065bb1f12cebbfb2f SHA512 49b4aaedfbb1fa5629dbb453bb74f5735c05b14407ea3d2bb1eaee9686e03661a3c471357d085ab839dff16df92d71dae3a6f17486c017a79a836c1d8780a250 |
| 27 |
DIST chromium-91.0.4472.77.tar.xz 949848268 BLAKE2B 6d32b7334399325046f4b6c8d2a766b2f42ff7cc74adf68da880113ebede13dbbeb52c2f7ffcdea8c8934ec16f2161300a0b727cec112463def5eb6e772fafec SHA512 06113c3627c1ccd390f078a52e0eaaf9c1d7178d568d6d2e37c96e1eb09fc0e872ac2b2d7ebe55e4da87eebee4965816bbba2f6ea53047f86cd5d0ad1d260a25 |
| 28 |
DIST chromium-92-patchset-5.tar.xz 2776 BLAKE2B d5504f4bd6bc771b93a89d6ac492bd1b7f64e227040bbba66dff847357d26a0fa4331cd3784b018b4e7a9be5713dc109d99ba88ed2ec8b9310c304e4ea08a681 SHA512 8e4808f7698295b9c76d6ff150291b1756e5de1971a639e1c4e8dcabdb1e40d46b9ddeaddafb53955c2aedfc7dfc01ee09d27f6c04df613e82518b6ddc70992c |
| 29 |
DIST chromium-92.0.4512.4.tar.xz 961899172 BLAKE2B 8525a5059c9350e36a232b49847f7bf4f561f9c1542a0761d31a06a2bd08a579e98c1cfe15fcd55af9ccc6aad701add35ba71f3ef7f942a0788d3d41057aaf99 SHA512 ac5a2c4b28c1518e848677dadc7ec53214484f9e53e057b4d8c8148d53b7cda97c0fd5397c2cf2cc5569c900b49139ba8cdd2795b706d79d53bccdfb55dc827c |
| 30 |
DIST chromium-ppc64le-3f575325dcc3bdfc419824518bac6d4c38241859.tar.xz 28880 BLAKE2B 60390c938cbe329867a721f061750cd49a1ed0b48808181f4a85fd0f369f6061619f4f5a3023f9890a11a21ce5d60f87f74374eb1250a2a7100bf7c7eff15df7 SHA512 594bd170c2da4dc2b6bfd3a8aed31ca6acd67a5fb4ee7c4fa8a63439feb46df003aba79118bfd54a4e01ba18f1d329e760894e169915c266118414ad62b7c3ae |
| 31 |
+DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb |
| 32 |
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf |
| 33 |
|
| 34 |
diff --git a/www-client/chromium/chromium-91.0.4472.77.ebuild b/www-client/chromium/chromium-91.0.4472.77.ebuild |
| 35 |
index 9bf79db3502..9b739234107 100644 |
| 36 |
--- a/www-client/chromium/chromium-91.0.4472.77.ebuild |
| 37 |
+++ b/www-client/chromium/chromium-91.0.4472.77.ebuild |
| 38 |
@@ -13,11 +13,12 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util |
| 39 |
|
| 40 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
| 41 |
HOMEPAGE="https://chromium.org/" |
| 42 |
-PATCHSET="5" |
| 43 |
+PATCHSET="6" |
| 44 |
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" |
| 45 |
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
| 46 |
https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip |
| 47 |
- https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz" |
| 48 |
+ https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz |
| 49 |
+ arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )" |
| 50 |
|
| 51 |
LICENSE="BSD" |
| 52 |
SLOT="0" |
| 53 |
@@ -247,6 +248,12 @@ src_prepare() { |
| 54 |
mkdir -p third_party/node/linux/node-linux-x64/bin || die |
| 55 |
ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die |
| 56 |
|
| 57 |
+ # bundled highway library does not support arm64 with GCC |
| 58 |
+ if use arm64; then |
| 59 |
+ rm -r third_party/highway/src || die |
| 60 |
+ ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die |
| 61 |
+ fi |
| 62 |
+ |
| 63 |
local keeplibs=( |
| 64 |
base/third_party/cityhash |
| 65 |
base/third_party/double_conversion |
| 66 |
@@ -729,6 +736,11 @@ src_configure() { |
| 67 |
# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470 |
| 68 |
append-cxxflags $(test-flags-CXX -flax-vector-conversions=all) |
| 69 |
|
| 70 |
+ # highway/libjxl relies on this with arm64 |
| 71 |
+ if use arm64 && tc-is-gcc; then |
| 72 |
+ append-cxxflags -flax-vector-conversions |
| 73 |
+ fi |
| 74 |
+ |
| 75 |
# Disable unknown warning message from clang. |
| 76 |
tc-is-clang && append-flags -Wno-unknown-warning-option |
Archives