1 |
commit: 1dbef46d5b9a78045ef036bc9aaea913441b142a |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 22 18:06:12 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 22 18:06:37 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dbef46d |
7 |
|
8 |
www-client/chromium: beta channel bump (60.0.3112.40) |
9 |
|
10 |
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77 |
11 |
|
12 |
www-client/chromium/Manifest | 2 +- |
13 |
...3112.24.ebuild => chromium-60.0.3112.40.ebuild} | 47 +++++++++++++++------- |
14 |
2 files changed, 33 insertions(+), 16 deletions(-) |
15 |
|
16 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
17 |
index 13d421824d6..16c8a59f61d 100644 |
18 |
--- a/www-client/chromium/Manifest |
19 |
+++ b/www-client/chromium/Manifest |
20 |
@@ -1,5 +1,5 @@ |
21 |
DIST chromium-59.0.3071.104.tar.xz 531895868 SHA256 a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA512 419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf WHIRLPOOL ab2fbd1beeb485a5c07743a5a84c850b5ad8178a1f97421a0aa0573817b474e633a6ac65ad43f7db67d35d257183ea4eceacd12b4cad63f88cd9777cfa498e68 |
22 |
-DIST chromium-60.0.3112.24.tar.xz 537341808 SHA256 26a4ef3e94399d23c077197ea47d5aab5d9165a6aa7eb8d4d66167fc043f2a94 SHA512 3abb8bd78f9235c69ae1372d939c215d582da00125ad26aa28e1c4dc2aef0b40e5cf593b6b0438bddcf9ef5928df0e44bed5e7b1a8752706704f4d71fae9353d WHIRLPOOL 467e3b8c4ea95c7bb432c1a1e6557e570141d7503b98e6a9bd8d2bded1e83779747c5f01358c877378a438f198d0db104ccb2ad044dcc22ad3d39d99ad183769 |
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 |
|
28 |
diff --git a/www-client/chromium/chromium-60.0.3112.24.ebuild b/www-client/chromium/chromium-60.0.3112.40.ebuild |
29 |
similarity index 95% |
30 |
rename from www-client/chromium/chromium-60.0.3112.24.ebuild |
31 |
rename to www-client/chromium/chromium-60.0.3112.40.ebuild |
32 |
index b6eb7690264..e389e0e3174 100644 |
33 |
--- a/www-client/chromium/chromium-60.0.3112.24.ebuild |
34 |
+++ b/www-client/chromium/chromium-60.0.3112.40.ebuild |
35 |
@@ -331,6 +331,22 @@ src_prepare() { |
36 |
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
37 |
} |
38 |
|
39 |
+bootstrap_gn() { |
40 |
+ if tc-is-cross-compiler; then |
41 |
+ local -x AR=${BUILD_AR} |
42 |
+ local -x CC=${BUILD_CC} |
43 |
+ local -x CXX=${BUILD_CXX} |
44 |
+ local -x NM=${BUILD_NM} |
45 |
+ local -x CFLAGS=${BUILD_CFLAGS} |
46 |
+ local -x CXXFLAGS=${BUILD_CXXFLAGS} |
47 |
+ local -x LDFLAGS=${BUILD_LDFLAGS} |
48 |
+ fi |
49 |
+ einfo "Building GN..." |
50 |
+ set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean |
51 |
+ echo "$@" |
52 |
+ "$@" || die |
53 |
+} |
54 |
+ |
55 |
src_configure() { |
56 |
local myconf_gn="" |
57 |
|
58 |
@@ -396,7 +412,6 @@ src_configure() { |
59 |
|
60 |
if tc-is-clang; then |
61 |
myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
62 |
- myconf_gn+=" clang_base_path=\"$(realpath $(dirname `which clang`)/..)\"" |
63 |
else |
64 |
myconf_gn+=" is_clang=false" |
65 |
fi |
66 |
@@ -423,16 +438,16 @@ src_configure() { |
67 |
|
68 |
local myarch="$(tc-arch)" |
69 |
if [[ $myarch = amd64 ]] ; then |
70 |
- target_arch=x64 |
71 |
+ myconf_gn+=" target_cpu=\"x64\"" |
72 |
ffmpeg_target_arch=x64 |
73 |
elif [[ $myarch = x86 ]] ; then |
74 |
- target_arch=ia32 |
75 |
+ myconf_gn+=" target_cpu=\"x86\"" |
76 |
ffmpeg_target_arch=ia32 |
77 |
elif [[ $myarch = arm64 ]] ; then |
78 |
- target_arch=arm64 |
79 |
+ myconf_gn+=" target_cpu=\"arm64\"" |
80 |
ffmpeg_target_arch=arm64 |
81 |
elif [[ $myarch = arm ]] ; then |
82 |
- target_arch=arm |
83 |
+ myconf_gn+=" target_cpu=\"arm\"" |
84 |
ffmpeg_target_arch=$(usex neon arm-neon arm) |
85 |
else |
86 |
die "Failed to determine target arch, got '$myarch'." |
87 |
@@ -465,20 +480,19 @@ src_configure() { |
88 |
# Make sure the build system will use the right tools, bug #340795. |
89 |
tc-export AR CC CXX NM |
90 |
|
91 |
- # https://bugs.gentoo.org/588596 |
92 |
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
93 |
- |
94 |
# Define a custom toolchain for GN |
95 |
myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\"" |
96 |
|
97 |
- # Tools for building programs to be executed on the build system, bug #410883. |
98 |
if tc-is-cross-compiler; then |
99 |
- export AR_host=$(tc-getBUILD_AR) |
100 |
- export CC_host=$(tc-getBUILD_CC) |
101 |
- export CXX_host=$(tc-getBUILD_CXX) |
102 |
- export NM_host=$(tc-getBUILD_NM) |
103 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
104 |
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\"" |
105 |
+ else |
106 |
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\"" |
107 |
fi |
108 |
|
109 |
+ # https://bugs.gentoo.org/588596 |
110 |
+ append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
111 |
+ |
112 |
# Bug 491582. |
113 |
export TMPDIR="${WORKDIR}/temp" |
114 |
mkdir -p -m 755 "${TMPDIR}" || die |
115 |
@@ -503,9 +517,12 @@ src_configure() { |
116 |
|
117 |
touch chrome/test/data/webui/i18n_process_css_test.html || die |
118 |
|
119 |
+ bootstrap_gn |
120 |
+ |
121 |
einfo "Configuring Chromium..." |
122 |
- tools/gn/bootstrap/bootstrap.py -v --no-clean --gn-gen-args "${myconf_gn}" || die |
123 |
- out/Release/gn gen --args="${myconf_gn}" out/Release || die |
124 |
+ set -- out/Release/gn gen --args="${myconf_gn}" out/Release |
125 |
+ echo "$@" |
126 |
+ "$@" || die |
127 |
} |
128 |
|
129 |
src_compile() { |