1 |
commit: 1c5423aab094796b3da7a2905f02cbdcdd6a7742 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 10 23:17:49 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 10 23:18:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5423aa |
7 |
|
8 |
www-client/chromium: replace host_binary function with a loop |
9 |
|
10 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6_p24 |
11 |
|
12 |
www-client/chromium/chromium-63.0.3239.84.ebuild | 10 +++------- |
13 |
www-client/chromium/chromium-64.0.3282.14.ebuild | 16 ++++++---------- |
14 |
2 files changed, 9 insertions(+), 17 deletions(-) |
15 |
|
16 |
diff --git a/www-client/chromium/chromium-63.0.3239.84.ebuild b/www-client/chromium/chromium-63.0.3239.84.ebuild |
17 |
index a23443e9896..be37d445c4f 100644 |
18 |
--- a/www-client/chromium/chromium-63.0.3239.84.ebuild |
19 |
+++ b/www-client/chromium/chromium-63.0.3239.84.ebuild |
20 |
@@ -537,9 +537,10 @@ src_configure() { |
21 |
"$@" || die |
22 |
} |
23 |
|
24 |
-host_binary() { |
25 |
+src_compile() { |
26 |
+ # Build mksnapshot and pax-mark it. |
27 |
local x |
28 |
- for x; do |
29 |
+ for x in mksnapshot v8_context_snapshot_generator; do |
30 |
if tc-is-cross-compiler; then |
31 |
eninja -C out/Release "host/${x}" |
32 |
pax-mark m "out/Release/host/${x}" |
33 |
@@ -548,11 +549,6 @@ host_binary() { |
34 |
pax-mark m "out/Release/${x}" |
35 |
fi |
36 |
done |
37 |
-} |
38 |
- |
39 |
-src_compile() { |
40 |
- # Build mksnapshot and pax-mark it. |
41 |
- host_binary mksnapshot v8_context_snapshot_generator |
42 |
|
43 |
# Work around circular dep issue |
44 |
# https://chromium-review.googlesource.com/c/chromium/src/+/617768 |
45 |
|
46 |
diff --git a/www-client/chromium/chromium-64.0.3282.14.ebuild b/www-client/chromium/chromium-64.0.3282.14.ebuild |
47 |
index e436cbd1b59..c0f32ba37a4 100644 |
48 |
--- a/www-client/chromium/chromium-64.0.3282.14.ebuild |
49 |
+++ b/www-client/chromium/chromium-64.0.3282.14.ebuild |
50 |
@@ -539,9 +539,13 @@ src_configure() { |
51 |
"$@" || die |
52 |
} |
53 |
|
54 |
-host_binary() { |
55 |
+src_compile() { |
56 |
+ # Calling this here supports resumption via FEATURES=keepwork |
57 |
+ python_setup |
58 |
+ |
59 |
+ # Build mksnapshot and pax-mark it. |
60 |
local x |
61 |
- for x; do |
62 |
+ for x in mksnapshot v8_context_snapshot_generator; do |
63 |
if tc-is-cross-compiler; then |
64 |
eninja -C out/Release "host/${x}" |
65 |
pax-mark m "out/Release/host/${x}" |
66 |
@@ -550,14 +554,6 @@ host_binary() { |
67 |
pax-mark m "out/Release/${x}" |
68 |
fi |
69 |
done |
70 |
-} |
71 |
- |
72 |
-src_compile() { |
73 |
- # Calling this here supports resumption via FEATURES=keepwork |
74 |
- python_setup |
75 |
- |
76 |
- # Build mksnapshot and pax-mark it. |
77 |
- host_binary mksnapshot v8_context_snapshot_generator |
78 |
|
79 |
# Work around circular dep issue |
80 |
# https://chromium-review.googlesource.com/c/chromium/src/+/617768 |