mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00
Code Issues Releases Activity

lang/rust-nightly: update to 1.32.0.20181214

Browse Source
This commit is contained in:
Jan Beich 2018-12-14 18:20:51 +00:00
parent 7102e5e9fc
commit 4c515ab8c0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=487456
6 changed files with 77 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lang/rust-nightly/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
# $FreeBSD$
PORTVERSION= 1.25.0.${NIGHTLY_DATE:C,-,,g}
PORTVERSION= 1.32.0.${NIGHTLY_DATE:C,-,,g}
PKGNAMESUFFIX= -nightly
DISTNAME= rustc-nightly-src
@ -9,21 +9,45 @@ MASTERDIR= ${.CURDIR}/../rust
PATCHDIR= ${.CURDIR}/files
DISTINFO_FILE= ${.CURDIR}/distinfo
CONFLICTS_BUILD= rust # see FIXME in `pre-fetch` in lang/rust/Makefile
CONFLICTS_INSTALL= rust
# Which source to pull:
# https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz
NIGHTLY_DATE= 2018-04-03
# https://static.rust-lang.org/dist/channel-rust-nightly.toml
NIGHTLY_DATE= 2018-12-14
NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/
# See WRKSRC/src/stage0.txt for this date
BOOTSTRAPS_DATE= 2018-03-18
BOOTSTRAPS_DATE= 2018-12-09
RUST_BOOTSTRAP_VERSION= beta
CARGO_BOOTSTRAP_VERSION= beta
# Other bootstraps aren't provided by upstream yet
ONLY_FOR_ARCHS= amd64 i386
IGNORE= is older than stable version. Get nightly via rustup or \
use lang/rust and pass RUSTC_BOOTSTRAP=1 via environ(7)
# Same as lang/rust except for src/vendor/ -> vendor/
CRATES_PATCHED_BY_FBSD10_FIX= vendor/libssh2-sys \
vendor/lzma-sys
post-patch: nightly-post-patch
nightly-post-patch:
# Work around unused_unsafe errors in libcore with stage0
@${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs
# Same as lang/rust except for src/vendor/ -> vendor/
pre-configure:
@for file in \
${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \
${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
mv "$$file" "$$file.dont-fix"; \
done
# Same as lang/rust except for src/vendor/ -> vendor/
post-configure:
@for file in \
${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \
${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
mv "$$file.dont-fix" "$$file"; \
done
.include "${MASTERDIR}/Makefile"

30
lang/rust-nightly/distinfo
View File

@ -1,15 +1,15 @@
SHA256 (rust/2018-03-18/cargo-beta-i686-unknown-freebsd.tar.gz) = 801354131957df03abedc8b11be483520941632a6976a7fdefde157e53b70391
SIZE (rust/2018-03-18/cargo-beta-i686-unknown-freebsd.tar.gz) = 4918903
SHA256 (rust/2018-03-18/cargo-beta-x86_64-unknown-freebsd.tar.gz) = ed420d91219f86ffa586cd773f19f75c0e192b683e7a7282580faf5b72c7b9de
SIZE (rust/2018-03-18/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 5209143
SHA256 (rust/2018-03-18/rust-std-beta-i686-unknown-freebsd.tar.gz) = 5a8135389201352f79ee16bd13555fbb192012c43733c997dc6a60061f6b24a6
SIZE (rust/2018-03-18/rust-std-beta-i686-unknown-freebsd.tar.gz) = 50414392
SHA256 (rust/2018-03-18/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 86907a7beaa22f52bd093898e0818048bb1ef4b2d45968fb794f69425c345004
SIZE (rust/2018-03-18/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 50222097
SHA256 (rust/2018-03-18/rustc-beta-i686-unknown-freebsd.tar.gz) = 3c34727da3299eb2f847320221eb258b1eac7a2ccca6e2b0b4752c32c763fc17
SIZE (rust/2018-03-18/rustc-beta-i686-unknown-freebsd.tar.gz) = 56749552
SHA256 (rust/2018-03-18/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 2d00f24c2bfd8112d798d0aab70ec60f12ad6978b5029f83d477345101a46cba
SIZE (rust/2018-03-18/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 56562280
SHA256 (rust/2018-04-03/rustc-nightly-src.tar.xz) = 41eb01d8cb8d60e3c2f7106561f1fc9025b3c2dbe08500ab61ce0711ad9f67b8
SIZE (rust/2018-04-03/rustc-nightly-src.tar.xz) = 54623116
TIMESTAMP = 1522784477
TIMESTAMP = 1544723442
SHA256 (rust/2018-12-14/rustc-nightly-src.tar.xz) = 0883dff11043cc07649ed9d02bc7f96f44d71ab8d91261ce141af3cab5dfcbb9
SIZE (rust/2018-12-14/rustc-nightly-src.tar.xz) = 100389872
SHA256 (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 1c59a13cc385c9e06b80202651f8af9e9e22658e1863de85ce67ca12a0940a46
SIZE (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70377440
SHA256 (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 12fa39ff525ddd64490e63be98b954c9ee66e0cf603143f49b04f1c5760f3885
SIZE (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 67038294
SHA256 (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 054d227205949638483fc13035c0657177ebe0e48da24b77f406c86b35aef0a0
SIZE (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 6256857
SHA256 (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = e01e810b8aa0e985d78918cc8934796b6c440e5bb87fd969c4ad074106492cea
SIZE (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = 71112245
SHA256 (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 869efa046038c4bebec34cc04f1187fbae70dda9294effccce31510a3365b775
SIZE (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 67329498
SHA256 (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = dcf240699f5a00a97350a8cb47653da2633e33deb9ad4e85a979c81ab2e59072
SIZE (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = 6020090

6
lang/rust-nightly/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs → lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs
View File

@ -1,6 +1,6 @@
--- src/librustc_back/target/i686_unknown_freebsd.rs.orig 2017-10-09 20:04:51 UTC
+++ src/librustc_back/target/i686_unknown_freebsd.rs
@@ -13,7 +13,7 @@ use target::{Target, TargetResult};
--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2018-06-19 04:35:53 UTC
+++ src/librustc_target/spec/i686_unknown_freebsd.rs
@@ -12,7 +12,7 @@ use spec::{LinkerFlavor, Target, TargetResult};
pub fn target() -> TargetResult {
let mut base = super::freebsd_base::opts();

22
lang/rust-nightly/files/patch-src_libstd_build.rs Normal file
View File

@ -0,0 +1,22 @@
--- src/libstd/build.rs.orig 2018-09-03 18:29:12 UTC
+++ src/libstd/build.rs
@@ -94,13 +94,18 @@ fn build_libbacktrace(target: &str) -> Result<(), ()>
.out_dir(&native.out_dir)
.warnings(false)
.file("../libbacktrace/alloc.c")
- .file("../libbacktrace/backtrace.c")
.file("../libbacktrace/dwarf.c")
.file("../libbacktrace/fileline.c")
.file("../libbacktrace/posix.c")
.file("../libbacktrace/read.c")
.file("../libbacktrace/sort.c")
.file("../libbacktrace/state.c");
+
+ if target.contains("freebsd") {
+ build.file("../libbacktrace/nounwind.c");
+ } else {
+ build.file("../libbacktrace/backtrace.c");
+ }
if target.contains("darwin") {
build.file("../libbacktrace/macho.c");

4
lang/rust-nightly/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py
View File

@ -1,6 +1,6 @@
--- src/llvm/utils/llvm-build/llvmbuild/main.py.orig 2015-10-28 01:10:50 UTC
--- src/llvm/utils/llvm-build/llvmbuild/main.py.orig 2018-04-04 08:39:57 UTC
+++ src/llvm/utils/llvm-build/llvmbuild/main.py
@@ -719,6 +719,8 @@ def add_magic_target_components(parser,
@@ -752,6 +752,8 @@ def add_magic_target_components(parser, project, opts)
# 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',

6
lang/rust/Makefile
View File

@ -103,7 +103,7 @@ X_PY_ENV= HOME="${WRKDIR}" \
OPENSSL_DIR="${OPENSSLBASE}"
X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py
CRATES_PATCHED_BY_FBSD10_FIX= src/vendor/libssh2-sys \
CRATES_PATCHED_BY_FBSD10_FIX?= src/vendor/libssh2-sys \
src/vendor/lzma-sys
pre-fetch:
@ -194,12 +194,14 @@ CCACHE_VALUE= "${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache"
CCACHE_VALUE= false
.endif
.if !target(pre-configure)
pre-configure:
@for file in \
${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/configure \
${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
mv "$$file" "$$file.dont-fix"; \
done
.endif
do-configure:
${SED} -E \
@ -230,12 +232,14 @@ do-configure:
fi; \
done
.if !target(post-configure)
post-configure:
@for file in \
${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/configure \
${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \
mv "$$file.dont-fix" "$$file"; \
done
.endif
post-configure-DOCS-on:
${REINPLACE_CMD} -e 's,%DOCS%,true,' ${WRKSRC}/config.toml