Attachment #584830 for bug #684896

Lines 36-42 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} Link Here

(-)a/dev-lang/rust/rust-1.36.0.ebuild (-2 / +16 lines)
36		36
37	LICENSE="\|\| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"	37	LICENSE="\|\| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
38		38
39	IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"	39	IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm thumbv7neon wasm ${ALL_LLVM_TARGETS[*]}"
40		40
41	# Please keep the LLVM dependency block separate. Since LLVM is slotted,	41	# Please keep the LLVM dependency block separate. Since LLVM is slotted,
42	# we need to really make sure we're not pulling one than more slot	42	# we need to really make sure we're not pulling one than more slot
Lines 140-145 src_configure() { Link Here
140	if use wasm; then	140	if use wasm; then
141	rust_targets="${rust_targets},\"wasm32-unknown-unknown\""	141	rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
142	fi	142	fi
		143
		144	if use thumbv7neon; then
		145	rust_targets="${rust_targets},\"thumbv7neon-unknown-linux-gnueabihf\""
		146	fi
		147
143	rust_targets="${rust_targets#,}"	148	rust_targets="${rust_targets#,}"
144		149
145	local extended="true" tools="\"cargo\","	150	local extended="true" tools="\"cargo\","
Lines 222-227 src_configure() { Link Here
222	linker = "$(usex system-llvm lld rust-lld)"	227	linker = "$(usex system-llvm lld rust-lld)"
223	EOF	228	EOF
224	fi	229	fi
		230
		231	if use thumbv7neon; then
		232	cat <<- EOF >> "${S}"/config.toml
		233	[target.thumbv7neon-unknown-linux-gnueabihf]
		234	cc = "$(tc-getBUILD_CC)"
		235	cxx = "$(tc-getBUILD_CXX)"
		236	linker = "$(tc-getCC)"
		237	ar = "$(tc-getAR)"
		238	EOF
		239	fi
225	}	240	}
226		241
227	src_compile() {	242	src_compile() {
228	--
229	dev-lang/rust/metadata.xml \| 1 +	243	dev-lang/rust/metadata.xml \| 1 +
230	1 file changed, 1 insertion(+)	244	1 file changed, 1 insertion(+)

Lines 10-15 Link Here

(-)a/dev-lang/rust/metadata.xml (-1 / +1 lines)
10	<flag name="system-llvm">Use the system LLVM install</flag>	10	<flag name="system-llvm">Use the system LLVM install</flag>
11	<flag name="rls">Install rls component</flag>	11	<flag name="rls">Install rls component</flag>
12	<flag name="rustfmt">Install rustfmt component</flag>	12	<flag name="rustfmt">Install rustfmt component</flag>
		13	<flag name="thumbv7neon">Build support for the thumbv7-neon target</flag>
13	<flag name="wasm">Build support for the wasm32-unknown-unknown	14	<flag name="wasm">Build support for the wasm32-unknown-unknown
14	target</flag>	15	target</flag>
15	</use>	16	</use>
16	--
17	profiles/arch/base/package.use.mask \| 4 ++++	17	profiles/arch/base/package.use.mask \| 4 ++++
18	1 file changed, 4 insertions(+)	18	1 file changed, 4 insertions(+)

Lines 1-6 Link Here

(-)a/profiles/arch/base/package.use.mask (-1 / +4 lines)
1	# Copyright 1999-2019 Gentoo Authors	1	# Copyright 1999-2019 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
		4	# Steffen Kuhn <nielson2@yandex.com> (17 May 2019)
		5	# thumbv7neon can only be built for armv7
		6	dev-lang/rust thumbv7neon
		7
4	# Craig Andrews <candrews@gentoo.org> (2019-07-03)	8	# Craig Andrews <candrews@gentoo.org> (2019-07-03)
5	# Raspberry Pi support is only available on arm.	9	# Raspberry Pi support is only available on arm.
6	# Mask raspberry-pi USE globally, unmask on arm.	10	# Mask raspberry-pi USE globally, unmask on arm.
7	--
8	profiles/arch/arm/armv7a/use.mask \| 2 ++	11	profiles/arch/arm/armv7a/use.mask \| 2 ++
9	1 file changed, 2 insertions(+)	12	1 file changed, 2 insertions(+)

Lines 5-10 Link Here

(-)a/profiles/arch/arm/armv7a/use.mask (-1 / +2 lines)
5	-armv6	5	-armv6
6	-armv6t2	6	-armv6t2
7		7
		8	-thumbv7neon
		9
8	-cpu_flags_arm_v4	10	-cpu_flags_arm_v4
9	-cpu_flags_arm_v5	11	-cpu_flags_arm_v5
10	-cpu_flags_arm_v6	12	-cpu_flags_arm_v6
11	--
12	dev-lang/rust/rust-1.36.0.ebuild \| 6 ++++++	13	dev-lang/rust/rust-1.36.0.ebuild \| 6 ++++++
13	1 file changed, 6 insertions(+)	14	1 file changed, 6 insertions(+)

Lines 112-117 pre_build_checks() { Link Here

(-)a/dev-lang/rust/rust-1.36.0.ebuild (+6 lines)
112		112
113	pkg_pretend() {	113	pkg_pretend() {
114	pre_build_checks	114	pre_build_checks
		115
		116	use arm && use thumbv7neon && if [[ "$(tc-is-softfloat)" != "no" ]]; then
		117	die "Neon support requires hardfloat system."
		118	else # don't do anything
		119	:;
		120	fi
115	}	121	}
116		122
117	pkg_setup() {	123	pkg_setup() {

Return to bug 684896