Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Nov 2015 22:17:36 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401025 - in head/lang/rust: . files
Message-ID:  <201511072217.tA7MHafT003076@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Nov  7 22:17:36 2015
New Revision: 401025
URL: https://svnweb.freebsd.org/changeset/ports/401025

Log:
  - Take maintainership
  - Provide target for 'make test': Use bundled rust regression test suite
  - Use bundled LLVM for now: Built with it, rust passes more regression tests
  - Bump PORTREVISION

Added:
  head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py   (contents, props changed)
Modified:
  head/lang/rust/Makefile

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Sat Nov  7 21:19:32 2015	(r401024)
+++ head/lang/rust/Makefile	Sat Nov  7 22:17:36 2015	(r401025)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rust
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		http://static.rust-lang.org/stage0-snapshots/:bootstrap
@@ -11,7 +12,7 @@ DISTFILES=	${RUST_SOURCE}:src \
 		${RUST_BOOT}:bootstrap
 EXTRACT_ONLY=	${RUST_SOURCE}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Language with a focus on memory safety and concurrency
 
 LICENSE=	APACHE20 \
@@ -58,9 +59,9 @@ CONFIGURE_ARGS=	--disable-valgrind --dis
 		--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}
+#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
@@ -71,6 +72,10 @@ LLNEXTGEN_DESC=		Build with grammar veri
 
 LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:${PORTSDIR}/devel/llnextgen
 
+# Note that make test does not work when rust is already installed
+TEST_TARGET=	check
+TEST_ENV+=	ALLOW_NONZERO_RLIMIT_CORE=1
+
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000

Added: head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py	Sat Nov  7 22:17:36 2015	(r401025)
@@ -0,0 +1,11 @@
+--- src/llvm/utils/llvm-build/llvmbuild/main.py.orig	2015-10-28 01:10:50 UTC
++++ src/llvm/utils/llvm-build/llvmbuild/main.py
+@@ -719,6 +719,8 @@ def add_magic_target_components(parser, 
+     # We handle a few special cases of target names here for historical
+     # reasons, as these are the names configure currently comes up with.
+     native_target_name = { 'x86' : 'X86',
++                           'i386' : 'X86',
++                           'amd64' : 'X86',
+                            'x86_64' : 'X86',
+                            'Unknown' : None }.get(opts.native_target,
+                                                   opts.native_target)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511072217.tA7MHafT003076>