1 |
commit: ebbbcdee2df5f21b78144b6a78fb217492eaecc1 |
2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 26 07:09:09 2017 +0000 |
4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 26 07:09:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebbbcdee |
7 |
|
8 |
www-client/chromium: dev channel bump (61.0.3135.4) |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
11 |
|
12 |
www-client/chromium/Manifest | 2 +- |
13 |
...0.3124.4.ebuild => chromium-61.0.3135.4.ebuild} | 68 +++++++++++++++------- |
14 |
.../chromium/files/chromium-gn-bootstrap-r10.patch | 18 ++++++ |
15 |
3 files changed, 65 insertions(+), 23 deletions(-) |
16 |
|
17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
18 |
index 16c8a59f61d..3f79f62ed46 100644 |
19 |
--- a/www-client/chromium/Manifest |
20 |
+++ b/www-client/chromium/Manifest |
21 |
@@ -1,5 +1,5 @@ |
22 |
DIST chromium-59.0.3071.104.tar.xz 531895868 SHA256 a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA512 419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf WHIRLPOOL ab2fbd1beeb485a5c07743a5a84c850b5ad8178a1f97421a0aa0573817b474e633a6ac65ad43f7db67d35d257183ea4eceacd12b4cad63f88cd9777cfa498e68 |
23 |
DIST chromium-60.0.3112.32.tar.xz 537426032 SHA256 d972469bfc26a3d135a1863c22b88e23a9f00096841f6392dbb83b75ad0d17f1 SHA512 625bac567f0717d1077ac77023c87bdd2ad1244d63c50ce6935bcb41b85aab4c06b05fda7e0f48cc7305c331080a350a16592adb37583c13736c97a55404d6ab WHIRLPOOL 78af7bbf83466c044428f294209512c27ed649e746829df083edf8e8fc4eddb23618606ec8571bc4eb433a7d67e921236c562c2c175f3685017ef2576b3f7802 |
24 |
DIST chromium-60.0.3112.40.tar.xz 537575476 SHA256 4fdc590fc6ef4af16cc72d790b9eaa50829cd8193893a9ec0719481b03f328d3 SHA512 0e121887f7158d47a9fdb7c0be43a0b1cb32d19a893f99cfc13e2ce146e553e6428fdd82815180bacb430eace42f8bf83595073cf449f49e963633e8414b07ef WHIRLPOOL b7b2b62f61c18ed77890383ba1ac2d25094e14c12042fa1b1af50fa1f8d69807673a036fdb54078622e92b32eb7211040fda3513cb079598e3caf1219c594631 |
25 |
-DIST chromium-61.0.3124.4.tar.xz 542178452 SHA256 8976732d3fbbbfe188d79cb64169a5ceafe8e23351b8fb650cfd02fdfd74a83c SHA512 6d690824376382774957c6eb0a35cb3bd443d3c501d7d5988d912dccd17da44e8e2bd5f9ac8b59d9381d7fbf67216e001dcf081591bd95c732018155f7b212f2 WHIRLPOOL 9a3720bb615a4f66cc77b5250dad50afb2301e076b1e0e334c0db770f420862051acac0bc68907ea1cc3f4b6a6edb108ea44f392b520c8ba916612f7eb7e54fa |
26 |
DIST chromium-61.0.3128.3.tar.xz 542407004 SHA256 21b284c71cbd1df1302b3d41f813765c8265ba279a78455447a30ada710e9929 SHA512 b5808dea9220182db2500f122b38e32707e285372e64031f5c5d238d82787172e44350e47bd2400ea267e8a857cd59f0db402ed2b542aa097afa4a797226e070 WHIRLPOOL 5eac6a151b7ce1634577e707ae2252a30549f13a029c95a73ec073b93022092dd7cac642060100d51fed01b594532526dddbda159a439bef0ca1b971d83bbd1a |
27 |
+DIST chromium-61.0.3135.4.tar.xz 544853344 SHA256 9ffc9be0e30cdd8fce80b91195e32b9d148510f5fa10bed833e5f3d897181bf6 SHA512 50daac20224be9b23fd19f1787b139402dc3b51ae2ef37c7ab1319d0d6d6f68d55501a429b8d3bef975e68d4cc862b1aa3e8dacbb48333b2fb8a973cdbf8fc5f WHIRLPOOL 6aaf54d10c83b022b60201b56d5ed50e61153f800d7dfe2f615cd6c2a598b0da0795548be7c502a2f72f5159e5ced3536efad466df5d24b854e12f9acbdc321b |
28 |
|
29 |
diff --git a/www-client/chromium/chromium-61.0.3124.4.ebuild b/www-client/chromium/chromium-61.0.3135.4.ebuild |
30 |
similarity index 93% |
31 |
rename from www-client/chromium/chromium-61.0.3124.4.ebuild |
32 |
rename to www-client/chromium/chromium-61.0.3135.4.ebuild |
33 |
index 2703b4c155c..abbfceaa88b 100644 |
34 |
--- a/www-client/chromium/chromium-61.0.3124.4.ebuild |
35 |
+++ b/www-client/chromium/chromium-61.0.3135.4.ebuild |
36 |
@@ -186,8 +186,7 @@ src_prepare() { |
37 |
local PATCHES=( |
38 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
39 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" |
40 |
- "${FILESDIR}/${PN}-gn-bootstrap-r9.patch" |
41 |
- "${FILESDIR}/${PN}-system-icu-r2.patch" |
42 |
+ "${FILESDIR}/${PN}-gn-bootstrap-r10.patch" |
43 |
) |
44 |
|
45 |
default |
46 |
@@ -213,10 +212,10 @@ src_prepare() { |
47 |
third_party/WebKit |
48 |
third_party/analytics |
49 |
third_party/angle |
50 |
- third_party/angle/src/common/third_party/numerics |
51 |
+ third_party/angle/src/common/third_party/base |
52 |
+ third_party/angle/src/common/third_party/murmurhash |
53 |
third_party/angle/src/third_party/compiler |
54 |
third_party/angle/src/third_party/libXNVCtrl |
55 |
- third_party/angle/src/third_party/murmurhash |
56 |
third_party/angle/src/third_party/trace_event |
57 |
third_party/boringssl |
58 |
third_party/brotli |
59 |
@@ -298,7 +297,6 @@ src_prepare() { |
60 |
third_party/swiftshader |
61 |
third_party/swiftshader/third_party/llvm-subzero |
62 |
third_party/swiftshader/third_party/subzero |
63 |
- third_party/tcmalloc |
64 |
third_party/usrsctp |
65 |
third_party/vulkan |
66 |
third_party/vulkan-validation-layers |
67 |
@@ -327,11 +325,30 @@ src_prepare() { |
68 |
keeplibs+=( third_party/libvpx ) |
69 |
keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
70 |
fi |
71 |
+ if use tcmalloc; then |
72 |
+ keeplibs+=( third_party/tcmalloc ) |
73 |
+ fi |
74 |
|
75 |
# Remove most bundled libraries. Some are still needed. |
76 |
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
77 |
} |
78 |
|
79 |
+bootstrap_gn() { |
80 |
+ if tc-is-cross-compiler; then |
81 |
+ local -x AR=${BUILD_AR} |
82 |
+ local -x CC=${BUILD_CC} |
83 |
+ local -x CXX=${BUILD_CXX} |
84 |
+ local -x NM=${BUILD_NM} |
85 |
+ local -x CFLAGS=${BUILD_CFLAGS} |
86 |
+ local -x CXXFLAGS=${BUILD_CXXFLAGS} |
87 |
+ local -x LDFLAGS=${BUILD_LDFLAGS} |
88 |
+ fi |
89 |
+ einfo "Building GN..." |
90 |
+ set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean |
91 |
+ echo "$@" |
92 |
+ "$@" || die |
93 |
+} |
94 |
+ |
95 |
src_configure() { |
96 |
local myconf_gn="" |
97 |
|
98 |
@@ -397,7 +414,6 @@ src_configure() { |
99 |
|
100 |
if tc-is-clang; then |
101 |
myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
102 |
- myconf_gn+=" clang_base_path=\"$(realpath $(dirname `which clang`)/..)\"" |
103 |
else |
104 |
myconf_gn+=" is_clang=false" |
105 |
fi |
106 |
@@ -424,16 +440,16 @@ src_configure() { |
107 |
|
108 |
local myarch="$(tc-arch)" |
109 |
if [[ $myarch = amd64 ]] ; then |
110 |
- target_arch=x64 |
111 |
+ myconf_gn+=" target_cpu=\"x64\"" |
112 |
ffmpeg_target_arch=x64 |
113 |
elif [[ $myarch = x86 ]] ; then |
114 |
- target_arch=ia32 |
115 |
+ myconf_gn+=" target_cpu=\"x86\"" |
116 |
ffmpeg_target_arch=ia32 |
117 |
elif [[ $myarch = arm64 ]] ; then |
118 |
- target_arch=arm64 |
119 |
+ myconf_gn+=" target_cpu=\"arm64\"" |
120 |
ffmpeg_target_arch=arm64 |
121 |
elif [[ $myarch = arm ]] ; then |
122 |
- target_arch=arm |
123 |
+ myconf_gn+=" target_cpu=\"arm\"" |
124 |
ffmpeg_target_arch=$(usex neon arm-neon arm) |
125 |
else |
126 |
die "Failed to determine target arch, got '$myarch'." |
127 |
@@ -466,20 +482,20 @@ src_configure() { |
128 |
# Make sure the build system will use the right tools, bug #340795. |
129 |
tc-export AR CC CXX NM |
130 |
|
131 |
- # https://bugs.gentoo.org/588596 |
132 |
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
133 |
- |
134 |
# Define a custom toolchain for GN |
135 |
myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\"" |
136 |
|
137 |
- # Tools for building programs to be executed on the build system, bug #410883. |
138 |
if tc-is-cross-compiler; then |
139 |
- export AR_host=$(tc-getBUILD_AR) |
140 |
- export CC_host=$(tc-getBUILD_CC) |
141 |
- export CXX_host=$(tc-getBUILD_CXX) |
142 |
- export NM_host=$(tc-getBUILD_NM) |
143 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
144 |
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\"" |
145 |
+ myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\"" |
146 |
+ else |
147 |
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\"" |
148 |
fi |
149 |
|
150 |
+ # https://bugs.gentoo.org/588596 |
151 |
+ append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
152 |
+ |
153 |
# Bug 491582. |
154 |
export TMPDIR="${WORKDIR}/temp" |
155 |
mkdir -p -m 755 "${TMPDIR}" || die |
156 |
@@ -504,9 +520,12 @@ src_configure() { |
157 |
|
158 |
touch chrome/test/data/webui/i18n_process_css_test.html || die |
159 |
|
160 |
+ bootstrap_gn |
161 |
+ |
162 |
einfo "Configuring Chromium..." |
163 |
- tools/gn/bootstrap/bootstrap.py -v --no-clean --gn-gen-args "${myconf_gn}" || die |
164 |
- out/Release/gn gen --args="${myconf_gn}" out/Release || die |
165 |
+ set -- out/Release/gn gen --args="${myconf_gn}" out/Release |
166 |
+ echo "$@" |
167 |
+ "$@" || die |
168 |
} |
169 |
|
170 |
src_compile() { |
171 |
@@ -516,8 +535,13 @@ src_compile() { |
172 |
fi |
173 |
|
174 |
# Build mksnapshot and pax-mark it. |
175 |
- eninja -C out/Release mksnapshot || die |
176 |
- pax-mark m out/Release/mksnapshot |
177 |
+ if tc-is-cross-compiler; then |
178 |
+ eninja -C out/Release host/mksnapshot || die |
179 |
+ pax-mark m out/Release/host/mksnapshot |
180 |
+ else |
181 |
+ eninja -C out/Release mksnapshot || die |
182 |
+ pax-mark m out/Release/mksnapshot |
183 |
+ fi |
184 |
|
185 |
# Even though ninja autodetects number of CPUs, we respect |
186 |
# user's options, for debugging with -j 1 or any other reason. |
187 |
|
188 |
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r10.patch b/www-client/chromium/files/chromium-gn-bootstrap-r10.patch |
189 |
new file mode 100644 |
190 |
index 00000000000..f27fe374eb4 |
191 |
--- /dev/null |
192 |
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r10.patch |
193 |
@@ -0,0 +1,18 @@ |
194 |
+--- a/tools/gn/bootstrap/bootstrap.py |
195 |
++++ b/tools/gn/bootstrap/bootstrap.py |
196 |
+@@ -447,6 +447,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
197 |
+ 'base/metrics/field_trial_param_associator.cc', |
198 |
+ 'base/metrics/histogram.cc', |
199 |
+ 'base/metrics/histogram_base.cc', |
200 |
++ 'base/metrics/histogram_functions.cc', |
201 |
+ 'base/metrics/histogram_samples.cc', |
202 |
+ 'base/metrics/metrics_hashes.cc', |
203 |
+ 'base/metrics/persistent_histogram_allocator.cc', |
204 |
+@@ -509,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
205 |
+ 'base/third_party/icu/icu_utf.cc', |
206 |
+ 'base/third_party/nspr/prtime.cc', |
207 |
+ 'base/threading/post_task_and_reply_impl.cc', |
208 |
++ 'base/threading/sequence_local_storage_map.cc', |
209 |
+ 'base/threading/sequenced_task_runner_handle.cc', |
210 |
+ 'base/threading/sequenced_worker_pool.cc', |
211 |
+ 'base/threading/simple_thread.cc', |