Attachment 168544 Details for Bug 208250 – v0

[patch] v0

rust_port_llvm.diff (text/plain), 1.68 KB, created by Jan Beich on 2016-03-23 17:12:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-03-23 17:12:47 UTC

Size: 1.68 KB

patch

obsolete

>commit 9d0e8e0 (HEAD -> tmp)
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Wed Mar 23 16:51:17 2016 +0000
>
>    lang/rust: add PORT_LLVM for pre-r401025 behavior
>    
>    PR:		?
>    Approved by:	riggs (maintainer, not yet!!!)
>---
> lang/rust/Makefile | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
>diff --git lang/rust/Makefile lang/rust/Makefile
>index 4640f6c..4d057c3 100644
>--- lang/rust/Makefile
>+++ lang/rust/Makefile
>@@ -58,22 +58,24 @@ CONFIGURE_ARGS=	--disable-valgrind --disable-docs \
> 		--enable-clang --mandir=${MANPREFIX}/man \
> 		--release-channel=${RUST_CHANNEL}
> 
>-# Use LLVM from ports, instead of the copy shipped with rust.
>-#LLVM_VER=	36
>-#BUILD_DEPENDS+=	llvm${LLVM_VER}>=0:${PORTSDIR}/devel/llvm${LLVM_VER}
>-#CONFIGURE_ARGS+=--llvm-root=${LOCALBASE}/llvm${LLVM_VER}
>-
> .if defined(BATCH) || defined(PACKAGE_BUILDING)
> MAKE_ARGS+=	VERBOSE=1
> .endif
> 
>-OPTIONS_DEFINE=		GDB LLNEXTGEN
>+OPTIONS_DEFINE=		GDB LLNEXTGEN PORT_LLVM
> GDB_DESC=		Install ports gdb (necessary for debugging rust programs)
> LLNEXTGEN_DESC=		Build with grammar verification
> 
> GDB_RUN_DEPENDS=		${LOCALBASE}/bin/gdb:${PORTSDIR}/devel/gdb
> LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:${PORTSDIR}/devel/llnextgen
> 
>+# Rust may pass more regression tests with bundled LLVM
>+PORT_LLVM_DESC=	Build against devel/llvm${LLVM_VER} instead of bundled version
>+PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:${PORTSDIR}/devel/llvm${LLVM_VER}
>+PORT_LLVM_CONFIGURE_ON=		--llvm-root=${LLVM_PREFIX}
>+LLVM_VER?=			36 # XXX Move to DEFAULT_VERSIONS
>+LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_VER}
>+
> # Note that make test does not work when rust is already installed
> TEST_TARGET=	check
> TEST_ENV+=	ALLOW_NONZERO_RLIMIT_CORE=1

Flags:

riggs: maintainer-approval+

Actions: View | Diff

Attachments on bug 208250: 168544