Attachment #584004 for bug #684896

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

(-)a/dev-lang/rust/rust-1.34.2.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 221-226 src_configure() { Link Here
221	linker = "rust-lld"	226	linker = "rust-lld"
222	EOF	227	EOF
223	fi	228	fi
		229
		230	if use thumbv7neon; then
		231	cat <<- EOF >> "${S}"/config.toml
		232	[target.thumbv7neon-unknown-linux-gnueabihf]
		233	cc = "$(tc-getBUILD_CC)"
		234	cxx = "$(tc-getBUILD_CXX)"
		235	linker = "$(tc-getCC)"
		236	ar = "$(tc-getAR)"
		237	EOF
		238	fi
224	}	239	}
225		240
226	src_compile() {	241	src_compile() {
227	--
228	profiles/arch/base/package.use.mask \| 4 ++++	242	profiles/arch/base/package.use.mask \| 4 ++++
229	1 file changed, 4 insertions(+)	243	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	# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)	8	# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
5	# Overlay can only be built on amd64 and x86	9	# Overlay can only be built on amd64 and x86
6	x11-apps/igt-gpu-tools overlay	10	x11-apps/igt-gpu-tools overlay
7	--
8	profiles/arch/arm/armv7a/use.mask \| 3 +++	11	profiles/arch/arm/armv7a/use.mask \| 3 +++
9	1 file changed, 3 insertions(+)	12	1 file changed, 3 insertions(+)

Lines 1-4 Link Here

(-)a/profiles/arch/arm/armv7a/use.mask (-1 / +3 lines)
1	# Unmask armv7 specific USE flags	1	# Unmask armv7 specific USE flags
		2
		3	-thumbv7neon
		4
2	-neon	5	-neon
3	-armvfp	6	-armvfp
4	-armv5te	7	-armv5te
5	metadata entry Signed-off-by: Steffen Kuhn <nielson2@yandex.com>	8	metadata entry Signed-off-by: Steffen Kuhn <nielson2@yandex.com>
6	--
7	dev-lang/rust/metadata.xml \| 2 ++	9	dev-lang/rust/metadata.xml \| 2 ++
8	dev-lang/rust/rust-1.34.2.ebuild \| 6 +++---	10	dev-lang/rust/rust-1.34.2.ebuild \| 6 +++---
9	2 files changed, 5 insertions(+), 3 deletions(-)	11	2 files changed, 5 insertions(+), 3 deletions(-)

Lines 8-13 Link Here

(-)a/dev-lang/rust/metadata.xml (+2 lines)
8	<use>	8	<use>
9	<flag name="cargo">Install cargo component</flag>	9	<flag name="cargo">Install cargo component</flag>
10	<flag name="clippy">Install clippy component</flag>	10	<flag name="clippy">Install clippy component</flag>
		11	<flag name="neon">Build support for the thumbv7neon
		12	target</flag>
11	<flag name="system-llvm">Use the system LLVM install</flag>	13	<flag name="system-llvm">Use the system LLVM install</flag>
12	<flag name="rls">Install rls component</flag>	14	<flag name="rls">Install rls component</flag>
13	<flag name="rustfmt">Install rustfmt component</flag>	15	<flag name="rustfmt">Install rustfmt component</flag>





LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"

IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm neon wasm ${ALL_LLVM_TARGETS[*]}"

# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling one than more slot

		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
	fi

	if use neon; then
		rust_targets="${rust_targets},\"thumbv7neon-unknown-linux-gnueabihf\""
	fi


		EOF
	fi

	if use neon; then
		cat <<- EOF >> "${S}"/config.toml
			[target.thumbv7neon-unknown-linux-gnueabihf]
			cc = "$(tc-getBUILD_CC)"

Return to bug 684896