From owner-svn-ports-head@freebsd.org Sat Nov 7 22:17:37 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2D15A29D53; Sat, 7 Nov 2015 22:17:37 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5597D1AB4; Sat, 7 Nov 2015 22:17:37 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7MHaMe003078; Sat, 7 Nov 2015 22:17:36 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7MHafT003076; Sat, 7 Nov 2015 22:17:36 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201511072217.tA7MHafT003076@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 7 Nov 2015 22:17:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401025 - in head/lang/rust: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 22:17:37 -0000 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 .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)