From owner-svn-ports-all@freebsd.org Fri Mar 25 06:38:24 2016 Return-Path: Delivered-To: svn-ports-all@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 4DAF2ADD612; Fri, 25 Mar 2016 06:38:24 +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 1D60F196C; Fri, 25 Mar 2016 06:38:24 +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 u2P6cNZv024685; Fri, 25 Mar 2016 06:38:23 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2P6cN3L024684; Fri, 25 Mar 2016 06:38:23 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201603250638.u2P6cN3L024684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 25 Mar 2016 06:38:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411819 - head/lang/rust X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2016 06:38:24 -0000 Author: riggs Date: Fri Mar 25 06:38:23 2016 New Revision: 411819 URL: https://svnweb.freebsd.org/changeset/ports/411819 Log: Re-enable build with ports LLVM by non-default OPTION PR: 208250 Submitted by: jbeich Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Mar 25 06:17:20 2016 (r411818) +++ head/lang/rust/Makefile Fri Mar 25 06:38:23 2016 (r411819) @@ -58,22 +58,24 @@ CONFIGURE_ARGS= --disable-valgrind --dis --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