Attachment 165379 Details for Bug 206091 – Patch with port updates. Fixed.

[patch] Patch with port updates. Fixed.

rust-nightly-patch.txt (text/plain), 10.17 KB, created by oleksii.tsai on 2016-01-11 00:48:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oleksii.tsai

Created: 2016-01-11 00:48:17 UTC

Size: 10.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 405654)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	rust-nightly
>-PORTVERSION=	1.3.0.20150703
>+PORTVERSION=	1.7.0.20160108
> CATEGORIES=	lang
> MASTER_SITES=	http://static.rust-lang.org/stage0-snapshots/:bootstrap
> DISTFILES=	${RUST_BOOT}:bootstrap
>@@ -10,21 +10,9 @@
> 		${DISTFILE_compiler_rt} \
> 		${DISTFILE_hoedown} \
> 		${DISTFILE_jemalloc} \
>+		${DISTFILE_liblibc} \
> 		${DISTFILE_rust_installer}
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	rust-lang
>-GH_PROJECT=	rust \
>-		compiler-rt:compiler_rt \
>-		hoedown:hoedown \
>-		jemalloc:jemalloc \
>-		rust-installer:rust_installer
>-GH_TAGNAME=	7b148381c7 \
>-		58ab642:compiler_rt \
>-		238c4d5:hoedown \
>-		e24a1a0:jemalloc \
>-		8e4f8ea:rust_installer
>-
> MAINTAINER=	dumbbell@FreeBSD.org
> COMMENT=	Language with a focus on memory safety and concurrency
> 
>@@ -34,6 +22,22 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE-APACHE \
> 		${WRKSRC}/LICENSE-MIT
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	rust-lang \
>+			rust-lang-nursery:liblibc
>+GH_PROJECT=	rust \
>+		compiler-rt:compiler_rt \
>+		hoedown:hoedown \
>+		jemalloc:jemalloc \
>+		libc:liblibc \
>+		rust-installer:rust_installer
>+GH_TAGNAME=	d70ab2b \
>+		b6087e8:compiler_rt \
>+		4638c60:hoedown \
>+		f84e309:jemalloc \
>+		e0c0bf4:liblibc \
>+		4915c75:rust_installer
>+
> ONLY_FOR_ARCHS=	amd64
> ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
> 
>@@ -45,7 +49,7 @@
> CONFLICTS_INSTALL=	rust-nightly
> 
> RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG}.tar.bz2
>-RUST_BOOT_SIG=	2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8
>+RUST_BOOT_SIG=	2015-12-18-3391630-freebsd-x86_64-91724d4e655807a2a2e940ac50992ebeaac16ea9
> 
> # Rust's libraries are named librustc_${component}-${RUST_VSN_HASH}.so.
> # The hash depends on Rust version and, if the channel is not "stable",
>@@ -59,7 +63,7 @@
> 
> USES=		gmake libedit python:2,build
> HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-valgrind --disable-docs \
>+CONFIGURE_ARGS=	--disable-valgrind-rpass --disable-docs \
> 		--enable-clang --mandir=${MANPREFIX}/man \
> 		--release-channel=${RUST_CHANNEL}
> 
>@@ -116,9 +120,11 @@
> 	  ${MV} ${WRKSRC_jemalloc} ${WRKSRC}/src/jemalloc)
> 	@(${RMDIR} ${WRKSRC}/src/rust-installer && \
> 	  ${MV} ${WRKSRC_rust_installer} ${WRKSRC}/src/rust-installer)
>+	@(${RMDIR} ${WRKSRC}/src/liblibc && \
>+	  ${MV} ${WRKSRC_liblibc} ${WRKSRC}/src/liblibc)
> 	@${MKDIR} ${WRKSRC}/dl
> 	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl
>-	(cd ${WRKSRC} && find . -type d -exec chmod 0755 {} \;)
>+	(cd ${WRKSRC} && ${FIND} . -type d -exec ${CHMOD} 0755 {} \;)
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>@@ -134,6 +140,11 @@
> 		< ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
> 		| ${XARGS} ${RM}; \
> 	fi
>+	@if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-x86_64-unknown-freebsd; then \
>+		${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
>+		< ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-x86_64-unknown-freebsd \
>+		| ${XARGS} ${RM}; \
>+	fi
> 	@${RM} \
> 		${STAGEDIR}${PREFIX}/lib/rustlib/components \
> 		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
>@@ -144,7 +155,10 @@
> 	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
> 	@${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
> 		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc
>+	@${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
>+		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-x86_64-unknown-freebsd
> 	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc.bak
>+	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-x86_64-unknown-freebsd.bak
> 	@${STRIP_CMD} \
> 		${STAGEDIR}${PREFIX}/bin/rustc \
> 		${STAGEDIR}${PREFIX}/bin/rustdoc \
>@@ -151,7 +165,9 @@
> 		${STAGEDIR}${PREFIX}/lib/*.so \
> 		${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
> .if ${PORT_OPTIONS:MDOCS}
>-	@${MV} ${STAGEDIR}${PREFIX}/share/doc/rust ${STAGEDIR}${DOCSDIR}
>+	@if ! test -d ${STAGEDIR}${DOCSDIR}; then \
>+		${MV} ${STAGEDIR}${PREFIX}/share/doc/rust ${STAGEDIR}${DOCSDIR}; \
>+	fi
> .endif
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 405654)
>+++ distinfo	(working copy)
>@@ -1,12 +1,16 @@
>-SHA256 (rust-stage0-2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8.tar.bz2) = 454530016c6a2f033de5fdfa6086a8caf78a597b99519f1b9a2ecbdd18b001eb
>-SIZE (rust-stage0-2015-05-24-ba0e1cd-freebsd-x86_64-370db40613f5c08563ed7e38357826dd42d4e0f8.tar.bz2) = 13137436
>-SHA256 (rust-lang-rust-1.3.0.20150703-7b148381c7_GH0.tar.gz) = 3df365a30727ffb733fe1cc20545b04eac7be20461c5bf3a51fc95b880a5fcf4
>-SIZE (rust-lang-rust-1.3.0.20150703-7b148381c7_GH0.tar.gz) = 6490885
>-SHA256 (rust-lang-compiler-rt-58ab642_GH0.tar.gz) = 5553488bae570271b7faf9f112b2594bb70d802d3d071f9ab0e37919e6327f98
>-SIZE (rust-lang-compiler-rt-58ab642_GH0.tar.gz) = 1938952
>-SHA256 (rust-lang-hoedown-238c4d5_GH0.tar.gz) = e2e62b68cc4ea415c6d584f5e97a4b94f60023acde30345ec7bd68aa52739368
>-SIZE (rust-lang-hoedown-238c4d5_GH0.tar.gz) = 60652
>-SHA256 (rust-lang-jemalloc-e24a1a0_GH0.tar.gz) = c50c61eae80772cbc7af0905110c30fcea267a57bbc930df115bd4a647a5e2e1
>-SIZE (rust-lang-jemalloc-e24a1a0_GH0.tar.gz) = 398919
>-SHA256 (rust-lang-rust-installer-8e4f8ea_GH0.tar.gz) = c865d4d2542e2a6588d928857caf910e201e32e200005c485964717bde7970aa
>-SIZE (rust-lang-rust-installer-8e4f8ea_GH0.tar.gz) = 14602
>+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 (rust-lang-rust-1.7.0.20160108-d70ab2b_GH0.tar.gz) = 52c63a2bd434e820345ccb8b34a15dc895aba73ccd991d14189a1be028460d10
>+SIZE (rust-lang-rust-1.7.0.20160108-d70ab2b_GH0.tar.gz) = 7023546
>+SHA256 (rust-lang-nursery-libc-e0c0bf4_GH0.tar.gz) = 3a30f4849288eeff770a5b082a44eced99caf4615c0fde54554896b42f23a69a
>+SIZE (rust-lang-nursery-libc-e0c0bf4_GH0.tar.gz) = 61902
>+SHA256 (rust-lang-compiler-rt-b6087e8_GH0.tar.gz) = d1af58c1b5680859659becd064b51eb9e30cfec8aa38f43a3c370796311fae7c
>+SIZE (rust-lang-compiler-rt-b6087e8_GH0.tar.gz) = 2170286
>+SHA256 (rust-lang-hoedown-4638c60_GH0.tar.gz) = c27c4fd8d24082ea6ced012dfefced9b4b2a3b90383b68276f08569803fe0c84
>+SIZE (rust-lang-hoedown-4638c60_GH0.tar.gz) = 65837
>+SHA256 (rust-lang-jemalloc-f84e309_GH0.tar.gz) = 287556535508c71bbf28c1f0ee9fcbe7c97ed40ba614d78af1d238200c55433c
>+SIZE (rust-lang-jemalloc-f84e309_GH0.tar.gz) = 439214
>+SHA256 (rust-lang-llvm-3564439_GH0.tar.gz) = 144e0008cd95854bc8503ad533c61c87abbc6343956ba68ec8021a3924f3d689
>+SIZE (rust-lang-llvm-3564439_GH0.tar.gz) = 21093569
>+SHA256 (rust-lang-rust-installer-4915c75_GH0.tar.gz) = 022116173684c97d61e014940aada20f3830d2d3e1670887bf1861997133c234
>+SIZE (rust-lang-rust-installer-4915c75_GH0.tar.gz) = 19234
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 405654)
>+++ pkg-plist	(working copy)
>@@ -13,8 +13,13 @@
> lib/librustc_borrowck-%%RUST_VSN_HASH%%.so
> lib/librustc_data_structures-%%RUST_VSN_HASH%%.so
> lib/librustc_driver-%%RUST_VSN_HASH%%.so
>+lib/librustc_front-%%RUST_VSN_HASH%%.so
> lib/librustc_lint-%%RUST_VSN_HASH%%.so
> lib/librustc_llvm-%%RUST_VSN_HASH%%.so
>+lib/librustc_metadata-%%RUST_VSN_HASH%%.so
>+lib/librustc_mir-%%RUST_VSN_HASH%%.so
>+lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.so
>+lib/librustc_plugin-%%RUST_VSN_HASH%%.so
> lib/librustc_privacy-%%RUST_VSN_HASH%%.so
> lib/librustc_resolve-%%RUST_VSN_HASH%%.so
> lib/librustc_trans-%%RUST_VSN_HASH%%.so
>@@ -23,6 +28,7 @@
> lib/libserialize-%%RUST_VSN_HASH%%.so
> lib/libstd-%%RUST_VSN_HASH%%.so
> lib/libsyntax-%%RUST_VSN_HASH%%.so
>+lib/libsyntax_ext-%%RUST_VSN_HASH%%.so
> lib/libterm-%%RUST_VSN_HASH%%.so
> lib/libtest-%%RUST_VSN_HASH%%.so
> lib/rustlib/components
>@@ -30,9 +36,12 @@
> lib/rustlib/etc/gdb_load_rust_pretty_printers.py
> lib/rustlib/etc/gdb_rust_pretty_printing.py
> lib/rustlib/manifest-rustc
>+lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
> lib/rustlib/rust-installer-version
> lib/rustlib/uninstall.sh
> lib/rustlib/%%RUST_TARGET%%/lib/liballoc-%%RUST_VSN_HASH%%.rlib
>+lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-%%RUST_VSN_HASH%%.rlib
>+lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/libarena-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/libarena-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/libcollections-%%RUST_VSN_HASH%%.rlib
>@@ -48,7 +57,6 @@
> lib/rustlib/%%RUST_TARGET%%/lib/liblibc-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/liblog-%%RUST_VSN_HASH%%.so
>-lib/rustlib/%%RUST_TARGET%%/lib/libmorestack.a
> lib/rustlib/%%RUST_TARGET%%/lib/librand-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/librbml-%%RUST_VSN_HASH%%.so
>@@ -58,8 +66,13 @@
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-%%RUST_VSN_HASH%%.so
>+lib/rustlib/%%RUST_TARGET%%/lib/librustc_front-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-%%RUST_VSN_HASH%%.so
>+lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-%%RUST_VSN_HASH%%.so
>+lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-%%RUST_VSN_HASH%%.so
>+lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-%%RUST_VSN_HASH%%.so
>+lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-%%RUST_VSN_HASH%%.so
>@@ -71,6 +84,7 @@
> lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/libstd-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-%%RUST_VSN_HASH%%.so
>+lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/libterm-%%RUST_VSN_HASH%%.rlib
> lib/rustlib/%%RUST_TARGET%%/lib/libterm-%%RUST_VSN_HASH%%.so
> lib/rustlib/%%RUST_TARGET%%/lib/libtest-%%RUST_VSN_HASH%%.rlib

Flags:

dumbbell: maintainer-approval+

Actions: View | Diff

Attachments on bug 206091: 165347 | 165379 | 165380 | 165381