Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 668370
Collapse All | Expand All

(-)a/var/portage/gentoo/www-client/chromium/chromium-69.0.3497.100.ebuild (-21 / +13 lines)
Lines 8-14 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he Link Here
8
	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
8
	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
9
	sv sw ta te th tr uk vi zh-CN zh-TW"
9
	sv sw ta te th tr uk vi zh-CN zh-TW"
10
10
11
inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
11
inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
12
12
13
DESCRIPTION="Open-source version of Google Chrome web browser"
13
DESCRIPTION="Open-source version of Google Chrome web browser"
14
HOMEPAGE="http://chromium.org/"
14
HOMEPAGE="http://chromium.org/"
Lines 101-107 DEPEND="${COMMON_DEPEND} Link Here
101
	sys-apps/hwids[usb(+)]
101
	sys-apps/hwids[usb(+)]
102
	>=sys-devel/bison-2.4.3
102
	>=sys-devel/bison-2.4.3
103
	sys-devel/flex
103
	sys-devel/flex
104
	>=sys-devel/clang-5
105
	virtual/pkgconfig
104
	virtual/pkgconfig
106
	dev-vcs/git
105
	dev-vcs/git
107
"
106
"
Lines 140-156 PATCHES=( Link Here
140
)
139
)
141
140
142
pre_build_checks() {
141
pre_build_checks() {
143
	#if [[ ${MERGE_TYPE} != binary ]]; then
142
	if [[ ${MERGE_TYPE} != binary ]]; then
144
	#	local -x CPP="$(tc-getCXX) -E"
143
		local -x CPP="$(tc-getCXX) -E"
145
	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
144
		if tc-is-clang && ! version_is_at_least "5.0" "$(clang-fullversion)"; then
146
	#		# bugs: #601654
145
			# bugs: #601654
147
	#		die "At least clang 3.9.1 is required"
146
			die "At least clang 5.0 is required"
148
	#	fi
147
		fi
149
	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
148
		if tc-is-gcc && ! version_is_at_least 6.0 "$(gcc-version)"; then
150
	#		# bugs: #535730, #525374, #518668, #600288, #627356
149
			# bugs: #535730, #525374, #518668, #600288, #627356
151
	#		die "At least gcc 5.0 is required"
150
			die "At least gcc 6.0 is required"
152
	#	fi
151
		fi
153
	#fi
152
	fi
154
153
155
	# Check build requirements, bug #541816 and bug #471810 .
154
	# Check build requirements, bug #541816 and bug #471810 .
156
	CHECKREQS_MEMORY="3G"
155
	CHECKREQS_MEMORY="3G"
Lines 371-383 src_configure() { Link Here
371
	# Make sure the build system will use the right tools, bug #340795.
370
	# Make sure the build system will use the right tools, bug #340795.
372
	tc-export AR CC CXX NM
371
	tc-export AR CC CXX NM
373
372
374
	if ! tc-is-clang; then
375
		# Force clang since gcc is pretty broken at the moment.
376
		CC=${CHOST}-clang
377
		CXX=${CHOST}-clang++
378
		strip-unsupported-flags
379
	fi
380
381
	if tc-is-clang; then
373
	if tc-is-clang; then
382
		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
374
		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
383
	else
375
	else
Lines 564-570 src_compile() { Link Here
564
	# Calling this here supports resumption via FEATURES=keepwork
556
	# Calling this here supports resumption via FEATURES=keepwork
565
	python_setup
557
	python_setup
566
558
567
	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
559
	"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
568
560
569
	# Build mksnapshot and pax-mark it.
561
	# Build mksnapshot and pax-mark it.
570
	local x
562
	local x

Return to bug 668370