Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 401024) +++ head/lang/rust/Makefile (revision 401025) @@ -1,140 +1,145 @@ # Created by: Jyun-Yan You # $FreeBSD$ 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 DISTNAME= ${PORTNAME}c-${PORTVERSION} 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 \ MIT LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE \ ${WRKSRC}/LICENSE-MIT ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of # the LDFLAGS. When stage0's rustc is linked, it picks the installed # librust*so and fails. CONFLICTS_BUILD= rust \ rust-nightly CONFLICTS_INSTALL= rust-nightly RUST_SOURCE= ${DISTNAME}-src${EXTRACT_SUFX} RUST_BOOT= rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2 RUST_BOOT_SIG_amd64= 2015-08-11-1af31d4-freebsd-x86_64-de1f36592bac0eeb90c049a8421246652c511b9e RUST_BOOT_SIG_i386= 2015-08-11-1af31d4-freebsd-i386-3cd4a44fb97b3135be3d1b760bea604a381e85dc # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so. # The hash depends on Rust version and, if the channel is not "stable", # the channel name. See $(CFG_FILENAME_EXTRA) definition in mk/main.mk. RUST_VSN= ${PORTVERSION} RUST_CHANNEL= stable RUST_VSN_HASH!= /usr/bin/printf '%s' ${RUST_VSN} | /sbin/md5 -q | cut -c 1-8 PLIST_SUB+= RUST_VSN_HASH=${RUST_VSN_HASH} # Rust's target arch string is different from *BSD arch strings RUST_ARCH_amd64= x86_64 RUST_ARCH_i386= i686 PLIST_SUB+= RUST_TARGET=${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} USES= gmake libedit python:2,build HAS_CONFIGURE= yes 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} +#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= LLNEXTGEN LLNEXTGEN_DESC= Build with grammar verification 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 BROKEN= Only compiles on FreeBSD 10 and 11 .endif pre-fetch: # FIXME: This is the same check for CONFLICTS as the standard # one, except port origins are not compared. This allows # the port to conflict with itself, because Rust would pick # installed Rust libraries instead of freshly built ones. @conflicts_with=$$( \ { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ for entry in $${conflicts_with}; do \ ${ECHO_MSG} " $${entry}"; \ done; \ ${ECHO_MSG}; \ ${ECHO_MSG} " They will not build together."; \ ${ECHO_MSG} " Please remove them first with pkg delete."; \ exit 1;\ fi post-extract: @${MKDIR} ${WRKSRC}/dl ${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl (cd ${WRKSRC} && find . -type d -exec chmod 0755 {} \;) post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mk/main.mk # In case the previous "make stage" failed, this ensures rust's # install.sh won't backup previously staged files before reinstalling # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: @if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ < ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \ | ${XARGS} ${RM}; \ fi @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/components \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \ ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh post-install: @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log @${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc.bak @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so .include Index: head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py =================================================================== --- head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py (nonexistent) +++ head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py (revision 401025) @@ -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) Property changes on: head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property