Date: Sun, 13 Dec 2015 14:21:05 +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: r403672 - head/lang/rust Message-ID: <201512131421.tBDEL5A3061095@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Dec 13 14:21:05 2015 New Revision: 403672 URL: https://svnweb.freebsd.org/changeset/ports/403672 Log: Update to upstream version 1.5.0; add OPTION to depend on gdb from ports Modified: head/lang/rust/Makefile head/lang/rust/distinfo.amd64 head/lang/rust/distinfo.i386 head/lang/rust/pkg-plist Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Sun Dec 13 14:12:43 2015 (r403671) +++ head/lang/rust/Makefile Sun Dec 13 14:21:05 2015 (r403672) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 1.5.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ http://static.rust-lang.org/stage0-snapshots/:bootstrap @@ -50,7 +49,8 @@ PLIST_SUB+= RUST_VSN_HASH=${RUST_VSN_HAS # 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} +RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} +PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= gmake libedit python:2,build HAS_CONFIGURE= yes @@ -67,9 +67,11 @@ CONFIGURE_ARGS= --disable-valgrind --dis MAKE_ARGS+= VERBOSE=1 .endif -OPTIONS_DEFINE= LLNEXTGEN +OPTIONS_DEFINE= GDB LLNEXTGEN +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 # Note that make test does not work when rust is already installed @@ -114,28 +116,35 @@ post-extract: 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: - @if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc; then \ +.for f in manifest-rustc manifest-rust-std-${RUST_TARGET} + @if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/${f}; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ - < ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \ + < ${STAGEDIR}${PREFIX}/lib/rustlib/${f} \ | ${XARGS} ${RM}; \ fi +.endfor @${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: - @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log +.for f in manifest-rustc manifest-rust-std-${RUST_TARGET} @${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ - ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc - @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc.bak + ${STAGEDIR}${PREFIX}/lib/rustlib/${f} + @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/${f}.bak +.endfor + @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ Modified: head/lang/rust/distinfo.amd64 ============================================================================== --- head/lang/rust/distinfo.amd64 Sun Dec 13 14:12:43 2015 (r403671) +++ head/lang/rust/distinfo.amd64 Sun Dec 13 14:21:05 2015 (r403672) @@ -1,4 +1,4 @@ -SHA256 (rustc-1.4.0-src.tar.gz) = 1c0dfdce5c85d8098fcebb9adf1493847ab40c1dfaa8cc997af09b2ef0aa8211 -SIZE (rustc-1.4.0-src.tar.gz) = 24537507 +SHA256 (rustc-1.5.0-src.tar.gz) = 641037af7b7b6cad0b231cc20671f8a314fbf2f40fc0901d0b877c39fc8da5a0 +SIZE (rustc-1.5.0-src.tar.gz) = 24586539 SHA256 (rust-stage0-2015-08-11-1af31d4-freebsd-x86_64-de1f36592bac0eeb90c049a8421246652c511b9e.tar.bz2) = e609347d8bf2d69b613068b8d7f158199e509fc14e859d343ba6d65c9ad76e24 SIZE (rust-stage0-2015-08-11-1af31d4-freebsd-x86_64-de1f36592bac0eeb90c049a8421246652c511b9e.tar.bz2) = 13973360 Modified: head/lang/rust/distinfo.i386 ============================================================================== --- head/lang/rust/distinfo.i386 Sun Dec 13 14:12:43 2015 (r403671) +++ head/lang/rust/distinfo.i386 Sun Dec 13 14:21:05 2015 (r403672) @@ -1,4 +1,4 @@ -SHA256 (rustc-1.4.0-src.tar.gz) = 1c0dfdce5c85d8098fcebb9adf1493847ab40c1dfaa8cc997af09b2ef0aa8211 -SIZE (rustc-1.4.0-src.tar.gz) = 24537507 +SHA256 (rustc-1.5.0-src.tar.gz) = 641037af7b7b6cad0b231cc20671f8a314fbf2f40fc0901d0b877c39fc8da5a0 +SIZE (rustc-1.5.0-src.tar.gz) = 24586539 SHA256 (rust-stage0-2015-08-11-1af31d4-freebsd-i386-3cd4a44fb97b3135be3d1b760bea604a381e85dc.tar.bz2) = 7ec34452c645ee6a7287ac58ac3bec94c1eb713777d98c5339fa57fc4f0ee49e SIZE (rust-stage0-2015-08-11-1af31d4-freebsd-i386-3cd4a44fb97b3135be3d1b760bea604a381e85dc.tar.bz2) = 14488008 Modified: head/lang/rust/pkg-plist ============================================================================== --- head/lang/rust/pkg-plist Sun Dec 13 14:12:43 2015 (r403671) +++ head/lang/rust/pkg-plist Sun Dec 13 14:21:05 2015 (r403672) @@ -32,6 +32,7 @@ lib/rustlib/components lib/rustlib/etc/debugger_pretty_printers_common.py lib/rustlib/etc/gdb_load_rust_pretty_printers.py lib/rustlib/etc/gdb_rust_pretty_printing.py +lib/rustlib/manifest-rust-std-%%RUST_TARGET%% lib/rustlib/manifest-rustc lib/rustlib/rust-installer-version lib/rustlib/uninstall.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512131421.tBDEL5A3061095>