Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 541610 | Differences between
and this patch

Collapse All | Expand All

(-)a/chromium-54.0.2840.59.ebuild (-12 / +198 lines)
Lines 13-25 inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multipro Link Here
13
13
14
DESCRIPTION="Open-source version of Google Chrome web browser"
14
DESCRIPTION="Open-source version of Google Chrome web browser"
15
HOMEPAGE="http://chromium.org/"
15
HOMEPAGE="http://chromium.org/"
16
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
16
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
17
nacl? (
18
	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib.json -> nacl_x86_newlib_11953a35fcd4f999b097a343bc49d89f94af21a8.json
19
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib.json -> pnacl_newlib_25a7ef81d2dc76b58450fa2d5f97070eafa20164.json
20
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/shared/pnacl_translator.json -> pnacl_translator_25a7ef81d2dc76b58450fa2d5f97070eafa20164.json
21
22
	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib/core_sdk.tgz.json -> core_sdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz.json
23
	https://storage.googleapis.com/nativeclient-archive2/toolchain/11953a35fcd4f999b097a343bc49d89f94af21a8/core_sdk_linux_x86.tgz -> core_sdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz
24
25
	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib/gdb_i686_linux.tgz.json -> gdb_i686_linux_a9a003c04d06a2ee9f3fbb6223ee31510543bb72.tgz.json
26
	https://storage.googleapis.com/nativeclient-once/object/gdb_i686_linux_a9a003c04d06a2ee9f3fbb6223ee31510543bb72.tgz
27
28
	https://storage.googleapis.com/nativeclient-archive2/builds/11953a35fcd4f999b097a343bc49d89f94af21a8/linux_x86/nacl_x86_newlib/naclsdk.tgz.json -> naclsdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz.json
29
	https://storage.googleapis.com/nativeclient-archive2/toolchain/11953a35fcd4f999b097a343bc49d89f94af21a8/naclsdk_linux_x86.tgz -> naclsdk_11953a35fcd4f999b097a343bc49d89f94af21a8.tgz
30
31
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/binutils_x86_64_linux.tgz.json -> binutils_x86_64_linux_8ccf4b8a74c844a041d2ad5d15e3999157eeffaf.tgz.json
32
	https://storage.googleapis.com/nativeclient-once/object/binutils_x86_64_linux_8ccf4b8a74c844a041d2ad5d15e3999157eeffaf.tgz
33
34
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/binutils_x86_x86_64_linux.tgz.json -> binutils_x86_x86_64_linux_48782a43a8af3479f0fe0a7aaace7d072aeb988f.tgz.json
35
	https://storage.googleapis.com/nativeclient-once/object/binutils_x86_x86_64_linux_48782a43a8af3479f0fe0a7aaace7d072aeb988f.tgz
36
37
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/compiler_rt_bc_i686_bc.tgz.json -> compiler_rt_bc_i686_bc_71090b27cd8b1715e837612db7bb6ae9884eb9b2.tgz.json
38
	https://storage.googleapis.com/nativeclient-once/object/compiler_rt_bc_i686_bc_71090b27cd8b1715e837612db7bb6ae9884eb9b2.tgz
39
40
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/compiler_rt_bc_le32.tgz.json -> compiler_rt_bc_le32_8ffbdf3186f342d7bfbac5d6d213d30d906ce0c8.tgz.json
41
	https://storage.googleapis.com/nativeclient-once/object/compiler_rt_bc_le32_8ffbdf3186f342d7bfbac5d6d213d30d906ce0c8.tgz
42
43
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/compiler_rt_bc_x86_64_bc.tgz.json -> compiler_rt_bc_x86_64_bc_835c0d337b0862daabf5f1c90c90acb70250d078.tgz.json
44
	https://storage.googleapis.com/nativeclient-once/object/compiler_rt_bc_x86_64_bc_835c0d337b0862daabf5f1c90c90acb70250d078.tgz
45
46
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/core_sdk_libs_i686.tgz.json -> core_sdk_libs_i686_da4ae62443144b77a31a9e995d48725d93d649ed.tgz.json
47
	https://storage.googleapis.com/nativeclient-once/object/core_sdk_libs_i686_da4ae62443144b77a31a9e995d48725d93d649ed.tgz
48
49
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/core_sdk_libs_le32.tgz.json -> core_sdk_libs_le32_ec7a6d86bc8b03a7dba36f4ec5b20688866101e9.tgz.json
50
	https://storage.googleapis.com/nativeclient-once/object/core_sdk_libs_le32_ec7a6d86bc8b03a7dba36f4ec5b20688866101e9.tgz
51
52
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/core_sdk_libs_x86_64.tgz.json -> core_sdk_libs_x86_64_16084d5bbd51b0c52d475d669675f6c57474abac.tgz.json
53
	https://storage.googleapis.com/nativeclient-once/object/core_sdk_libs_x86_64_16084d5bbd51b0c52d475d669675f6c57474abac.tgz
54
55
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/driver_x86_64_linux.tgz.json -> driver_x86_64_linux_aebe5000b2daaa6ca9fff580835fa5d5948fdebc.tgz.json
56
	https://storage.googleapis.com/nativeclient-once/object/driver_x86_64_linux_aebe5000b2daaa6ca9fff580835fa5d5948fdebc.tgz
57
58
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libcxx_i686.tgz.json -> libcxx_i686_ba67ebc8ed4865c85d28ac3189e36a492fd5906a.tgz.json
59
	https://storage.googleapis.com/nativeclient-once/object/libcxx_i686_ba67ebc8ed4865c85d28ac3189e36a492fd5906a.tgz
60
61
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libcxx_i686_bc.tgz.json -> libcxx_i686_bc_2ec9472750ffb4ff9714cfa5c17c933f08f63e9a.tgz.json
62
	https://storage.googleapis.com/nativeclient-once/object/libcxx_i686_bc_2ec9472750ffb4ff9714cfa5c17c933f08f63e9a.tgz
63
64
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libcxx_le32.tgz.json -> libcxx_le32_cd7894ffc6dd897b9549ed5930c4e46cec037de3.tgz.json
65
	https://storage.googleapis.com/nativeclient-once/object/libcxx_le32_cd7894ffc6dd897b9549ed5930c4e46cec037de3.tgz
66
67
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libcxx_x86_64.tgz.json -> libcxx_x86_64_54d64049fb92ed08573101943a02a52d0d3fda90.tgz.json
68
	https://storage.googleapis.com/nativeclient-once/object/libcxx_x86_64_54d64049fb92ed08573101943a02a52d0d3fda90.tgz
69
70
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libcxx_x86_64_bc.tgz.json -> libcxx_x86_64_bc_cf9a7da4e44786685120a521f6fbbcece2ea177f.tgz.json
71
	https://storage.googleapis.com/nativeclient-once/object/libcxx_x86_64_bc_cf9a7da4e44786685120a521f6fbbcece2ea177f.tgz
72
73
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libcxx_x86_64_linux.tgz.json -> libcxx_x86_64_linux_232c2b1151bad4df41fe89551f32e5f81ebc716f.tgz.json
74
	https://storage.googleapis.com/nativeclient-once/object/libcxx_x86_64_linux_232c2b1151bad4df41fe89551f32e5f81ebc716f.tgz
75
76
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libgcc_eh_x86_32.tgz.json -> libgcc_eh_x86_32_6dc8bbe08474537602c66fd6db3024b812d91448.tgz.json
77
	https://storage.googleapis.com/nativeclient-once/object/libgcc_eh_x86_32_6dc8bbe08474537602c66fd6db3024b812d91448.tgz
78
79
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libgcc_eh_x86_64.tgz.json -> libgcc_eh_x86_64_729cfb07fe284ff8deb43d30467ab31a3ae17edd.tgz.json
80
	https://storage.googleapis.com/nativeclient-once/object/libgcc_eh_x86_64_729cfb07fe284ff8deb43d30467ab31a3ae17edd.tgz
81
82
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_i686.tgz.json -> libs_support_i686_97b91213450f99f7562375aa934779ba98b5d598.tgz.json
83
	https://storage.googleapis.com/nativeclient-once/object/libs_support_i686_97b91213450f99f7562375aa934779ba98b5d598.tgz
84
85
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_i686_bc.tgz.json -> libs_support_i686_bc_a270af9146913a4c0d922f0380a21e61e09e5ea8.tgz.json
86
	https://storage.googleapis.com/nativeclient-once/object/libs_support_i686_bc_a270af9146913a4c0d922f0380a21e61e09e5ea8.tgz
87
88
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_le32.tgz.json -> libs_support_le32_ebaf6761a9ba9d5c3f2693b78efd5988763a712c.tgz.json
89
	https://storage.googleapis.com/nativeclient-once/object/libs_support_le32_ebaf6761a9ba9d5c3f2693b78efd5988763a712c.tgz
90
91
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_translator_x86_32.tgz.json -> libs_support_translator_x86_32_270be6a605f07e051e645d1af63fe2dd7b32543a.tgz.json
92
	https://storage.googleapis.com/nativeclient-once/object/libs_support_translator_x86_32_270be6a605f07e051e645d1af63fe2dd7b32543a.tgz
93
94
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_translator_x86_32_nonsfi.tgz.json -> libs_support_translator_x86_32_nonsfi_0d890fe58714973398681c3cd82c0d1e2ac5521b.tgz.json
95
	https://storage.googleapis.com/nativeclient-once/object/libs_support_translator_x86_32_nonsfi_0d890fe58714973398681c3cd82c0d1e2ac5521b.tgz
96
97
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_translator_x86_64.tgz.json -> libs_support_translator_x86_64_ae6ca014ebc54ae04f398324eff54f2492330c3f.tgz.json
98
	https://storage.googleapis.com/nativeclient-once/object/libs_support_translator_x86_64_ae6ca014ebc54ae04f398324eff54f2492330c3f.tgz
99
100
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_x86_64.tgz.json -> libs_support_x86_64_2c339a4b13ae5a3bc6dce14f78a9ed405960fce7.tgz.json
101
	https://storage.googleapis.com/nativeclient-once/object/libs_support_x86_64_2c339a4b13ae5a3bc6dce14f78a9ed405960fce7.tgz
102
103
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/libs_support_x86_64_bc.tgz.json -> libs_support_x86_64_bc_96a311b617562f6035ddebddcfa8ef57955f4d63.tgz.json
104
	https://storage.googleapis.com/nativeclient-once/object/libs_support_x86_64_bc_96a311b617562f6035ddebddcfa8ef57955f4d63.tgz
105
106
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/llvm_x86_64_linux.tgz.json -> llvm_x86_64_linux_4714c5a92e796beda585a7aa080069cdd3d4f4eb.tgz.json
107
	https://storage.googleapis.com/nativeclient-once/object/llvm_x86_64_linux_4714c5a92e796beda585a7aa080069cdd3d4f4eb.tgz
108
109
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/metadata.tgz.json -> metadata_3e42a7875fe3db05f30ceb7132008b530a60e429.tgz.json
110
	https://storage.googleapis.com/nativeclient-once/object/metadata_3e42a7875fe3db05f30ceb7132008b530a60e429.tgz
111
112
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/newlib_i686.tgz.json -> newlib_i686_bc57b675ba76cde66ad58810c2fb64fbbc888b50.tgz.json
113
	https://storage.googleapis.com/nativeclient-once/object/newlib_i686_bc57b675ba76cde66ad58810c2fb64fbbc888b50.tgz
114
115
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/newlib_i686_bc.tgz.json -> newlib_i686_bc_665d891237ad05188343e99663ae22d6af07378b.tgz.json
116
	https://storage.googleapis.com/nativeclient-once/object/newlib_i686_bc_665d891237ad05188343e99663ae22d6af07378b.tgz
117
118
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/newlib_le32.tgz.json -> newlib_le32_c6642a55a464c9ee71b8c38117dccb83781a8db6.tgz.json
119
	https://storage.googleapis.com/nativeclient-once/object/newlib_le32_c6642a55a464c9ee71b8c38117dccb83781a8db6.tgz
120
121
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/newlib_x86_64.tgz.json -> newlib_x86_64_4d77590618780ad27f9d02be457cf5d402fea69a.tgz.json
122
	https://storage.googleapis.com/nativeclient-once/object/newlib_x86_64_4d77590618780ad27f9d02be457cf5d402fea69a.tgz
123
124
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/newlib_x86_64_bc.tgz.json -> newlib_x86_64_bc_a90b5589e73df4fac7557f083e82c3f9a0d4da2e.tgz.json
125
	https://storage.googleapis.com/nativeclient-once/object/newlib_x86_64_bc_a90b5589e73df4fac7557f083e82c3f9a0d4da2e.tgz
126
127
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/unsandboxed_runtime_x86_32_linux.tgz.json -> unsandboxed_runtime_x86_32_linux_ec43cb9a60d17bb73aa07c41cc69cf6713820357.tgz.json
128
	https://storage.googleapis.com/nativeclient-once/object/unsandboxed_runtime_x86_32_linux_ec43cb9a60d17bb73aa07c41cc69cf6713820357.tgz
129
130
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/linux_x86/pnacl_newlib/unsandboxed_runtime_x86_64_linux.tgz.json -> unsandboxed_runtime_x86_64_linux_39cd59ce6be14ee949c9f430947bd393fb6182e8.tgz.json
131
	https://storage.googleapis.com/nativeclient-once/object/unsandboxed_runtime_x86_64_linux_39cd59ce6be14ee949c9f430947bd393fb6182e8.tgz
132
133
	https://storage.googleapis.com/nativeclient-archive2/builds/25a7ef81d2dc76b58450fa2d5f97070eafa20164/shared/pnacl_translator/sandboxed_translators.tgz.json -> sandboxed_translators_588542cc5272b1ef528750e378e7a2afbc8f3fff.tgz.json
134
	https://storage.googleapis.com/nativeclient-once/object/sandboxed_translators_588542cc5272b1ef528750e378e7a2afbc8f3fff.tgz
135
)"
17
136
18
LICENSE="BSD"
137
LICENSE="BSD"
19
SLOT="0"
138
SLOT="0"
20
KEYWORDS="amd64 ~arm ~arm64 x86"
139
KEYWORDS="amd64 ~arm ~arm64 x86"
21
IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
140
IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos nacl neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine"
22
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
141
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) arm? ( !nacl ) arm64? ( !nacl )"
23
142
24
# Native Client binaries are compiled with different set of flags, bug #452066.
143
# Native Client binaries are compiled with different set of flags, bug #452066.
25
QA_FLAGS_IGNORED=".*\.nexe"
144
QA_FLAGS_IGNORED=".*\.nexe"
Lines 166-171 PATCHES=( Link Here
166
	"${FILESDIR}/${PN}-widevine-r1.patch"
285
	"${FILESDIR}/${PN}-widevine-r1.patch"
167
	"${FILESDIR}/chromium-54-ffmpeg2compat.patch"
286
	"${FILESDIR}/chromium-54-ffmpeg2compat.patch"
168
	"${FILESDIR}/${PN}-gn-bootstrap-ld.patch"
287
	"${FILESDIR}/${PN}-gn-bootstrap-ld.patch"
288
	"${FILESDIR}/${PN}-gn-nacl.patch"
169
)
289
)
170
290
171
pkg_pretend() {
291
pkg_pretend() {
Lines 193-198 pkg_setup() { Link Here
193
	chromium_suid_sandbox_check_kernel_config
313
	chromium_suid_sandbox_check_kernel_config
194
}
314
}
195
315
316
src_unpack() {
317
	unpack ${P}.tar.xz
318
319
	if use nacl; then
320
		local toolchains
321
		# for NaCL we have to place toolchain JSON metadata files into appropriate place
322
		# so download_nacl_toolchains.py can find and use them for archives extraction
323
		for jsonfile in $DISTDIR/*.json; do
324
			case $jsonfile in
325
				*.tgz.json) ;; # Skip per-package metadata
326
327
				*.json) # create symlinks and directories for toolchain metadata JSON files
328
					jsonfile=${jsonfile##*/}
329
					local toolchain=${jsonfile%_*}
330
					toolchains="${toolchains} ${toolchain}"
331
332
					mkdir -p ${S}/native_client/toolchain/.tars/linux_x86/${toolchain} &&
333
					ln -s ${DISTDIR}/${jsonfile} ${S}/native_client/toolchain/.tars/linux_x86/${toolchain}.json ||
334
					die
335
				;;
336
			esac
337
		done
338
339
		for jsonfile in ${DISTDIR}/*.tgz.json; do
340
			# getting package hash from JSON file to use it as a destination tar name
341
			local tgzhash
342
			tgzhash=$( grep '"hash"' $jsonfile ) || die
343
			tgzhash=${tgzhash%\"*}
344
			tgzhash=${tgzhash##*\"}
345
			# stripping path components from JSON file
346
			jsonfile=${jsonfile##*/}
347
			# original tar archive name
348
			local distfile=${jsonfile%.json}
349
			# tar archive name without revision hash
350
			local tgzname=${distfile%_*.tgz}.tgz
351
			# checking toolchain name this package belongs to
352
			local jsondest
353
			jsondest=$( grep -l "$tgzname" ${S}/native_client/toolchain/.tars/linux_x86/*.json ) || die
354
			jsondest=${jsondest%.json}
355
			jsondest=${jsondest##*/}
356
			# placing everything into appropriate places
357
			mkdir -p ${S}/native_client/toolchain/.tars/package_archives/${tgzname} &&
358
			ln -s ${DISTDIR}/${distfile} ${S}/native_client/toolchain/.tars/package_archives/${tgzname}/${tgzhash}.tgz &&
359
			ln -s ${DISTDIR}/${jsonfile} ${S}/native_client/toolchain/.tars/linux_x86/${jsondest}/${tgzname}.json ||
360
			die
361
		done
362
363
		# Use download_nacl_toolchains.py to extract archives
364
		cd $S || die
365
		for toolchain in $toolchains; do
366
			python build/download_nacl_toolchains.py --packages $toolchain extract --skip-missing || die
367
		done
368
		cd $WORKDIR || die
369
	fi
370
}
371
196
src_prepare() {
372
src_prepare() {
197
	default
373
	default
198
374
Lines 314-319 src_prepare() { Link Here
314
			third_party/yasm/run_yasm.py
490
			third_party/yasm/run_yasm.py
315
		)
491
		)
316
	fi
492
	fi
493
	if use nacl; then
494
		keeplibs+=(
495
			native_client/src/third_party/dlmalloc
496
		)
497
	fi
317
498
318
	# Remove most bundled libraries. Some are still needed.
499
	# Remove most bundled libraries. Some are still needed.
319
	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
500
	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
Lines 330-338 src_configure() { Link Here
330
	# additions, bug #336871.
511
	# additions, bug #336871.
331
	myconf_gyp+=" -Ddisable_sse2=1"
512
	myconf_gyp+=" -Ddisable_sse2=1"
332
513
333
	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
514
	if ! use nacl ; then
334
	myconf_gyp+=" -Ddisable_nacl=1"
515
		myconf_gyp+=" -Ddisable_nacl=1"
335
	myconf_gn+=" enable_nacl=false"
516
		myconf_gn+=" enable_nacl=false"
517
	fi
336
518
337
	# Make it possible to remove third_party/adobe.
519
	# Make it possible to remove third_party/adobe.
338
	echo > "${T}/flapper_version.h" || die
520
	echo > "${T}/flapper_version.h" || die
Lines 535-540 src_configure() { Link Here
535
		fi
717
		fi
536
	fi
718
	fi
537
719
720
	if use nacl; then
721
		filter-flags -fstack-protector -fstack-protector-strong
722
		append-flags -fno-stack-protector
723
	fi
724
538
	# Make sure the build system will use the right tools, bug #340795.
725
	# Make sure the build system will use the right tools, bug #340795.
539
	tc-export AR CC CXX NM
726
	tc-export AR CC CXX NM
540
727
Lines 632-643 src_install() { Link Here
632
	doexe out/Release/chromedriver || die
819
	doexe out/Release/chromedriver || die
633
	use widevine && doexe out/Release/libwidevinecdmadapter.so
820
	use widevine && doexe out/Release/libwidevinecdmadapter.so
634
821
635
	# if ! use arm; then
822
	if use nacl; then
636
	#	doexe out/Release/nacl_helper{,_bootstrap} || die
823
		doexe out/Release/nacl_helper{,_bootstrap} || die
637
	#	insinto "${CHROMIUM_HOME}"
824
		insinto "${CHROMIUM_HOME}"
638
	#	doins out/Release/nacl_irt_*.nexe || die
825
		doins out/Release/nacl_irt_*.nexe || die
639
	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
826
	fi
640
	# fi
641
827
642
	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
828
	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
643
	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
829
	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
(-)a/files/chromium-gn-nacl.patch (+33 lines)
Line 0 Link Here
1
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
2
index eecb409..61b9bee 100644
3
--- a/build/toolchain/gcc_toolchain.gni
4
+++ b/build/toolchain/gcc_toolchain.gni
5
@@ -452,10 +452,16 @@ template("clang_toolchain") {
6
     toolprefix = ""
7
   }
8
 
9
   gcc_toolchain(target_name) {
10
-    prefix = rebase_path("$clang_base_path/bin", root_build_dir)
11
-    cc = "$prefix/clang"
12
-    cxx = "$prefix/clang++"
13
+    if (is_clang) {
14
+      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
15
+      cc = "$prefix/clang"
16
+      cxx = "$prefix/clang++"
17
+    } else {
18
+      cc = getenv("CC")
19
+      cxx = getenv("CXX")
20
+    }
21
+
22
     ld = cxx
23
 
24
     readelf = "${toolprefix}readelf"
25
@@ -468,7 +478,7 @@ template("clang_toolchain") {
26
       if (defined(invoker.toolchain_args)) {
27
         forward_variables_from(invoker.toolchain_args, "*")
28
       }
29
-      is_clang = true
30
+      is_clang = is_clang
31
     }
32
   }
33
 }

Return to bug 541610