Index: head/lang/rust/Makefile
===================================================================
--- head/lang/rust/Makefile (revision 413500)
+++ head/lang/rust/Makefile (revision 413501)
@@ -1,157 +1,158 @@
# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
# $FreeBSD$
PORTNAME= rust
-PORTVERSION?= 1.7.0
+PORTVERSION?= 1.8.0
CATEGORIES= lang
MASTER_SITES= http://static.rust-lang.org/dist/:src \
http://static.rust-lang.org/stage0-snapshots/:bootstrap
DISTNAME?= ${PORTNAME}c-${PORTVERSION}
DISTFILES?= ${DISTNAME}-src${EXTRACT_SUFX}:src
DISTFILES+= ${RUST_BOOT}:bootstrap
EXTRACT_ONLY?= ${DISTFILES:N*\:bootstrap:C/:.*//}
MAINTAINER?= riggs@FreeBSD.org
COMMENT= Language with a focus on memory safety and concurrency
LICENSE= APACHE20 \
MIT
LICENSE_COMB= dual
# APACHE20 license is standard, see Templates/Licenses/APACHE20
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
ONLY_FOR_ARCHS?= amd64 i386
ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler
BROKEN_FreeBSD_9= Only compiles on FreeBSD 10 and 11
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-nightly
CONFLICTS_BUILD+= ${PKGBASE}
CONFLICTS_INSTALL?= rust-nightly
RUST_BOOT= rust-stage0-${RUST_BOOT_SIG_${ARCH}}.tar.bz2
-RUST_BOOT_SIG_x86_64?= 2015-12-18-3391630-dragonfly-x86_64-e74d79488e88ac2de3bd03afd5959d2ae6e2b628
-RUST_BOOT_SIG_amd64?= 2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9
-RUST_BOOT_SIG_i386?= 2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5
+RUST_BOOT_SIG_x86_64?= 2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02
+RUST_BOOT_SIG_amd64?= 2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804
+RUST_BOOT_SIG_i386?= 2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2
# 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:C/\.[0-9]{8}$//}
.if defined(.PARSEDIR) # fixes |make describe| on 9.x (which is BROKEN)
RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//}
.endif
RUST_VSN_HASH!= /usr/bin/printf '%s' ${RUST_VSN}${PKGNAMESUFFIX} | /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_x86_64= x86_64 # dragonfly
RUST_ARCH_amd64= x86_64
RUST_ARCH_i386= i686
RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl}
PLIST_SUB+= RUST_TARGET=${RUST_TARGET}
-USES= gmake libedit python:2,build
+USES= compiler gmake libedit python:2,build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --disable-valgrind --disable-docs \
- --enable-clang --mandir=${MANPREFIX}/man \
+ ${CHOSEN_COMPILER_TYPE:Mclang:C/.+/--enable-&/} \
+ --mandir=${MANPREFIX}/man \
--release-channel=${RUST_CHANNEL}
.if defined(BATCH) || defined(PACKAGE_BUILDING)
MAKE_ARGS+= VERBOSE=1
.endif
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:devel/gdb
LLNEXTGEN_BUILD_DEPENDS= LLnextgen: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: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
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
${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} +
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/mk/main.mk
@${REINPLACE_CMD} -e 's|gdb|${LOCALBASE}/bin/gdb|' \
${WRKSRC}/src/etc/rust-gdb
# 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:
@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
| ${XARGS} ${RM}; \
fi; \
done
@${RM} \
${STAGEDIR}${PREFIX}/lib/rustlib/components \
${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-${RUST_TARGET} \
${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
post-install:
@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
done
@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
# FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
# but they contain non-object files which make strip(1) unhappy.
@${STRIP_CMD} \
${STAGEDIR}${PREFIX}/bin/rustc \
${STAGEDIR}${PREFIX}/bin/rustdoc \
${STAGEDIR}${PREFIX}/lib/*.so \
${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
.include <bsd.port.mk>
Index: head/lang/rust/distinfo.amd64
===================================================================
--- head/lang/rust/distinfo.amd64 (revision 413500)
+++ head/lang/rust/distinfo.amd64 (revision 413501)
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.7.0-src.tar.gz) = 6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a
-SIZE (rustc-1.7.0-src.tar.gz) = 25097611
-SHA256 (rust-stage0-2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9.tar.bz2) = 26bf4aadcb54c1336042fcabb1d50d96ee3630675bd80e8b9be5dacce3681d92
-SIZE (rust-stage0-2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9.tar.bz2) = 14884969
+SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
+SIZE (rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 6123aa870918555835623548e7edbf79480cd754c649fda844dc3c14e4e142f2
+SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-x86_64-f38991fbb81c1cd8d0bbda396f98f13a55b42804.tar.bz2) = 15922558
Index: head/lang/rust/distinfo.i386
===================================================================
--- head/lang/rust/distinfo.i386 (revision 413500)
+++ head/lang/rust/distinfo.i386 (revision 413501)
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.7.0-src.tar.gz) = 6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a
-SIZE (rustc-1.7.0-src.tar.gz) = 25097611
-SHA256 (rust-stage0-2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5.tar.bz2) = 80b8faebc3a917bc83c02a98028e6d0284709d60973e5261555c3126869009b1
-SIZE (rust-stage0-2015-12-18-3391630-freebsd-i386-7e624c50494402e1feb14c743d659fbd71b448f5.tar.bz2) = 15436433
+SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
+SIZE (rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 (rust-stage0-2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2.tar.bz2) = 578be492263cf9512020662fa35a493ec0589870e9de2e45e0aa63d40f515a3e
+SIZE (rust-stage0-2016-02-17-4d3eebf-freebsd-i386-4e2af0b34eb335e173aebff543be693724a956c2.tar.bz2) = 17417438
Index: head/lang/rust/distinfo.x86_64
===================================================================
--- head/lang/rust/distinfo.x86_64 (revision 413500)
+++ head/lang/rust/distinfo.x86_64 (revision 413501)
@@ -1,4 +1,4 @@
-SHA256 (rustc-1.7.0-src.tar.gz) = 6df96059d87b718676d9cd879672e4e22418b6093396b4ccb5b5b66df37bf13a
-SIZE (rustc-1.7.0-src.tar.gz) = 25097611
-SHA256 (rust-stage0-2015-12-18-3391630-dragonfly-x86_64-e74d79488e88ac2de3bd03afd5959d2ae6e2b628.tar.bz2) = 33b893943bb57885ef113c1a157eb0f4360b81b91f8846fc11ae5768fc49b381
-SIZE (rust-stage0-2015-12-18-3391630-dragonfly-x86_64-e74d79488e88ac2de3bd03afd5959d2ae6e2b628.tar.bz2) = 16913394
+SHA256 (rustc-1.8.0-src.tar.gz) = af4466147e8d4db4de2a46e07494d2dc2d96313c5b37da34237f511c905f7449
+SIZE (rustc-1.8.0-src.tar.gz) = 25641320
+SHA256 (rust-stage0-2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02.tar.bz2) = 4e4155a410042ffa149ac26e94c1c5cd9f24aae7e647deed54e694f88cf33d5c
+SIZE (rust-stage0-2016-02-17-4d3eebf-dragonfly-x86_64-765bb5820ad406e966ec0ac51c8070b656459b02.tar.bz2) = 18130945
Index: head/lang/rust/files/patch-src_snapshots.txt
===================================================================
--- head/lang/rust/files/patch-src_snapshots.txt (nonexistent)
+++ head/lang/rust/files/patch-src_snapshots.txt (revision 413501)
@@ -0,0 +1,11 @@
+--- src/snapshots.txt.orig 2016-04-11 21:22:04 UTC
++++ src/snapshots.txt
+@@ -6,6 +6,8 @@ S 2016-02-17 4d3eebf
+ winnt-i386 0c336d794a65f8e285c121866c7d59aa2dd0d1e1
+ winnt-x86_64 27e75b1bf99770b3564bcebd7f3230be01135a92
+ openbsd-x86_64 ac957c6b84de2bd67f01df085d9ea515f96e22f3
++ freebsd-i386 4e2af0b34eb335e173aebff543be693724a956c2
++ freebsd-x86_64 f38991fbb81c1cd8d0bbda396f98f13a55b42804
+
+ S 2015-12-18 3391630
+ bitrig-x86_64 6476e1562df02389b55553b4c88b1f4fd121cd40
Property changes on: head/lang/rust/files/patch-src_snapshots.txt
___________________________________________________________________
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