Attachment 156878 Details for Bug 200284 – lang_rust_1.0.0.patch

[patch] lang_rust_1.0.0.patch

file_200284.txt (text/plain), 11.55 KB, created by Maciej Pasternacki on 2015-05-18 15:28:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maciej Pasternacki

Created: 2015-05-18 15:28:01 UTC

Size: 11.55 KB

patch

obsolete

>diff --git i/lang/rust/Makefile w/lang/rust/Makefile
>index ab2923f..53d25e8 100644
>--- i/lang/rust/Makefile
>+++ w/lang/rust/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	rust
>-PORTVERSION=	0.12.0
>-PORTREVISION=	1
>+PORTVERSION=	1.0.0
> CATEGORIES=	lang
> MASTER_SITES=	http://static.rust-lang.org/dist/:src \
> 		http://static.rust-lang.org/stage0-snapshots/:bootstrap
>@@ -23,9 +22,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE-APACHE \
> ONLY_FOR_ARCHS=	amd64
> ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
> 
>-RUST_SOURCE=	${DISTNAME}${EXTRACT_SUFX}
>+RUST_SOURCE=	rustc-${DISTVERSIONFULL}-src${EXTRACT_SUFX}
> RUST_BOOT=	rust-stage0-${RUST_BOOT_SIG}.tar.bz2
>-RUST_BOOT_SIG=	2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694
>+RUST_BOOT_SIG=	2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0
>+WRKSRC=		${WRKDIR}/rustc-${DISTVERSIONFULL}
> 
> USES=		gmake perl5 python:2
> HAS_CONFIGURE=	yes
>@@ -59,8 +59,12 @@ post-extract:
> 	${LN} -sf ${DISTDIR}/${RUST_BOOT} ${WRKSRC}/dl
> 
> post-install:
>-	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest
>+	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc
>+	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
>+	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
> 	@${STRIP_CMD} `${GREP} -v -e '^@dir' -e '^man' -e 'rlib$$' \
>-		-e '^.*\.a$$' ${PLIST} | ${SED} 's:^:${STAGEDIR}${PREFIX}/:'`
>+		-e '^.*\.a$$' -e '^.*\.py$$' -e '^%' -e '^.*/rust-gdb$$' \
>+		 -e '^.*rustlib/components$$' -e '^.*/rust-installer-version$$' \
>+		${PLIST} | ${SED} 's:^:${STAGEDIR}${PREFIX}/:'`
> 
> .include <bsd.port.post.mk>
>diff --git i/lang/rust/distinfo w/lang/rust/distinfo
>index 2a3bd3c..948abf6 100644
>--- i/lang/rust/distinfo
>+++ w/lang/rust/distinfo
>@@ -1,4 +1,4 @@
>-SHA256 (rust-0.12.0.tar.gz) = 883e66b24d90d9957c5c538469fcde6f0668e5fb6448beecfc60884060e769b7
>-SIZE (rust-0.12.0.tar.gz) = 21223176
>-SHA256 (rust-stage0-2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694.tar.bz2) = 3f486b75a92c96b4bb63cb043037e6ff58bf5adde9d29e9e197959d6959de0b2
>-SIZE (rust-stage0-2014-10-04-749ff5e-freebsd-x86_64-f39d94487d29b3d48217b1295ad2cda8c941e694.tar.bz2) = 12701560
>+SHA256 (rustc-1.0.0-src.tar.gz) = c304cbd4f7b25d116b73c249f66bdb5c9da8645855ce195a41bda5077b995eba
>+SIZE (rustc-1.0.0-src.tar.gz) = 22121878
>+SHA256 (rust-stage0-2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0.tar.bz2) = c09d2f622217129b4c5a5ae0b889315606d993c22c3f6ee2ffc06e997940f113
>+SIZE (rust-stage0-2015-04-27-857ef6e-freebsd-x86_64-18925db56f6298cc190d1f41615ab5871de1dda0.tar.bz2) = 12915343
>diff --git i/lang/rust/files/patch-configure w/lang/rust/files/patch-configure
>index 4c49b41..b1520ea 100644
>--- i/lang/rust/files/patch-configure
>+++ w/lang/rust/files/patch-configure
>@@ -1,15 +1,15 @@
>---- configure.orig	2014-01-20 12:44:20.637789551 +0800
>-+++ configure	2014-01-20 12:45:23.726260411 +0800
>-@@ -424,7 +424,6 @@
>+--- configure.orig	2015-05-15 18:50:36 UTC
>++++ configure
>+@@ -678,7 +678,6 @@ putvar CFG_BOOTSTRAP_KEY
>+ 
>  step_msg "looking for build programs"
>  
>- probe_need CFG_PERL        perl
> -probe_need CFG_CURLORWGET  curl wget
>  probe_need CFG_PYTHON      python2.7 python2.6 python2 python
>  
>  python_version=$($CFG_PYTHON -V 2>&1)
>-@@ -547,14 +546,6 @@
>-     fi
>+@@ -805,13 +804,6 @@ then
>+     putvar CFG_LOCAL_RUST_ROOT
>  fi
>  
> -# Force freebsd to build with clang; gcc doesn't like us there
>@@ -17,9 +17,8 @@
> -then
> -    step_msg "on FreeBSD, forcing use of clang"
> -    CFG_ENABLE_CLANG=1
>--    putvar CFG_ENABLE_CLANG
> -fi
> -
>- if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
>+ # Force bitrig to build with clang; gcc doesn't like us there
>+ if [ $CFG_OSTYPE = unknown-bitrig ]
>  then
>-     err "either clang or gcc is required"
>diff --git i/lang/rust/pkg-plist w/lang/rust/pkg-plist
>index 85ae3ab..9816898 100644
>--- i/lang/rust/pkg-plist
>+++ w/lang/rust/pkg-plist
>@@ -1,91 +1,81 @@
>+bin/rust-gdb
> bin/rustc
> bin/rustdoc
>+lib/libarena-4e7c5e5c.so
>+lib/libflate-4e7c5e5c.so
>+lib/libfmt_macros-4e7c5e5c.so
> lib/libgetopts-4e7c5e5c.so
>+lib/libgraphviz-4e7c5e5c.so
>+lib/liblog-4e7c5e5c.so
>+lib/librbml-4e7c5e5c.so
>+lib/librustc-4e7c5e5c.so
>+lib/librustc_back-4e7c5e5c.so
>+lib/librustc_borrowck-4e7c5e5c.so
>+lib/librustc_driver-4e7c5e5c.so
>+lib/librustc_lint-4e7c5e5c.so
> lib/librustc_llvm-4e7c5e5c.so
>+lib/librustc_privacy-4e7c5e5c.so
>+lib/librustc_resolve-4e7c5e5c.so
>+lib/librustc_trans-4e7c5e5c.so
>+lib/librustc_typeck-4e7c5e5c.so
> lib/librustdoc-4e7c5e5c.so
>-lib/libnative-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libfourcc-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.rlib
>+lib/libserialize-4e7c5e5c.so
>+lib/libstd-4e7c5e5c.so
>+lib/libsyntax-4e7c5e5c.so
>+lib/libterm-4e7c5e5c.so
>+lib/libtest-4e7c5e5c.so
>+lib/rustlib/components
>+lib/rustlib/etc/gdb_load_rust_pretty_printers.py
>+lib/rustlib/etc/gdb_rust_pretty_printing.py
>+lib/rustlib/rust-installer-version
> lib/rustlib/x86_64-unknown-freebsd/lib/liballoc-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libtime-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/libcollections-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a
>+lib/rustlib/x86_64-unknown-freebsd/lib/libcore-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.rlib
> lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.so
> lib/rustlib/x86_64-unknown-freebsd/lib/libmorestack.a
>-lib/rustlib/x86_64-unknown-freebsd/lib/libnative-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libcore-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libhexfloat-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librand-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc-4e7c5e5c.so
> lib/rustlib/x86_64-unknown-freebsd/lib/librustc_back-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libunicode-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libgetopts-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libsync-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/librlibc-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libflate-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_bitflags-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_borrowck-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_driver-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_lint-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_llvm-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_privacy-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_resolve-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_trans-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustc_typeck-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/librustdoc-4e7c5e5c.so
> lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libregex-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/liburl-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libregex_macros-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.so
>+lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.so
> lib/rustlib/x86_64-unknown-freebsd/lib/libsyntax-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libnum-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libnative-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/librand-4e7c5e5c.rlib
> lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libcompiler-rt.a
>-lib/rustlib/x86_64-unknown-freebsd/lib/libarena-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libtime-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/liblog-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libregex-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/librbml-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libglob-4e7c5e5c.so
> lib/rustlib/x86_64-unknown-freebsd/lib/libterm-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libserialize-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libdebug-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libnum-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libglob-4e7c5e5c.rlib
>+lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.rlib
> lib/rustlib/x86_64-unknown-freebsd/lib/libtest-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libgreen-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/librustrt-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libsemver-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libfmt_macros-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libgraphviz-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libuuid-4e7c5e5c.rlib
>-lib/rustlib/x86_64-unknown-freebsd/lib/libsync-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/libstd-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/liburl-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/librustc-4e7c5e5c.so
>-lib/rustlib/x86_64-unknown-freebsd/lib/liblibc-4e7c5e5c.rlib
>-lib/librustc_back-4e7c5e5c.so
>-lib/libflate-4e7c5e5c.so
>-lib/libregex-4e7c5e5c.so
>-lib/libgraphviz-4e7c5e5c.so
>-lib/libsyntax-4e7c5e5c.so
>-lib/libarena-4e7c5e5c.so
>-lib/libtime-4e7c5e5c.so
>-lib/liblog-4e7c5e5c.so
>-lib/librbml-4e7c5e5c.so
>-lib/libterm-4e7c5e5c.so
>-lib/libserialize-4e7c5e5c.so
>-lib/libdebug-4e7c5e5c.so
>-lib/libtest-4e7c5e5c.so
>-lib/librustrt-4e7c5e5c.so
>-lib/libfmt_macros-4e7c5e5c.so
>-lib/libsync-4e7c5e5c.so
>-lib/libstd-4e7c5e5c.so
>-lib/librustc-4e7c5e5c.so
>-man/man1/rustdoc.1.gz
>+lib/rustlib/x86_64-unknown-freebsd/lib/libunicode-4e7c5e5c.rlib
> man/man1/rustc.1.gz
>+man/man1/rustdoc.1.gz
> @dir lib/rustlib/x86_64-unknown-freebsd/lib
> @dir lib/rustlib/x86_64-unknown-freebsd
> @dir lib/rustlib
>+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-APACHE
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIT
>+%%PORTDOCS%%%%DOCSDIR%%/README.md

Actions: View | Diff

Attachments on bug 200284: 156877 | 156878