svn commit: r443485 - in head/lang/rust: . files
Thomas Zander
riggs at FreeBSD.org
Tue Jun 13 05:34:57 UTC 2017
Author: riggs
Date: Tue Jun 13 05:34:55 2017
New Revision: 443485
URL: https://svnweb.freebsd.org/changeset/ports/443485
Log:
Fix build on HEAD
Submitted by: dim, rhurlin at gwdg.de (via mail)
Modified:
head/lang/rust/Makefile
head/lang/rust/files/extra-patch-ino64
Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile Tue Jun 13 03:30:51 2017 (r443484)
+++ head/lang/rust/Makefile Tue Jun 13 05:34:55 2017 (r443485)
@@ -46,6 +46,7 @@ CONFLICTS_INSTALL?= rust-nightly
RUST_BOOTSTRAP_DIR?= 2017-04-27
RUST_BOOTSTRAP_VERSION?= 1.17.0
+RUST_BOOTSTRAP_HASH?= f4594d3e53dcb114
RUSTC_BOOTSTRAP= ${RUST_BOOTSTRAP_DIR}/rustc-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
RUST_STD_BOOTSTRAP= ${RUST_BOOTSTRAP_DIR}/rust-std-${RUST_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
@@ -135,8 +136,8 @@ pre-fetch:
exit 1;\
fi
-LIBSTD= rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd/rust-std-${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/rustlib/${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib
-STDF= std-aef6cb139bd07bdc.0.o
+LIBSTD= rust-std-${RUST_BOOTSTRAP_VERSION}-${RUST_ARCH_${ARCH}}-unknown-freebsd/rust-std-${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/rustlib/${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/libstd-f4594d3e53dcb114.rlib
+STDF= std-${RUST_BOOTSTRAP_HASH}.0.o
post-extract:
@${MKDIR} \
@@ -157,7 +158,7 @@ post-extract:
${LD} -r -o ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} ${WRKSRC}/old_fstat.o
${MV} ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF}
(cd ${WRKSRC} && ${AR} r ${WRKSRC}/${LIBSTD} ${STDF})
- ${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd
+ ${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-${RUST_BOOTSTRAP_VERSION}-${RUST_ARCH_${ARCH}}-unknown-freebsd
${MV} ${WRKSRC}/rustc.tbz ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP}
.endif
Modified: head/lang/rust/files/extra-patch-ino64
==============================================================================
--- head/lang/rust/files/extra-patch-ino64 Tue Jun 13 03:30:51 2017 (r443484)
+++ head/lang/rust/files/extra-patch-ino64 Tue Jun 13 05:34:55 2017 (r443485)
@@ -110,7 +110,7 @@
pub type rlim_t = i64;
--- ./src/libstd/os/freebsd/raw.rs.orig 2017-04-24 18:53:46.000000000 +0000
+++ ./src/libstd/os/freebsd/raw.rs 2017-05-25 16:25:42.304715000 +0000
-@@ -38,32 +38,48 @@
+@@ -38,32 +38,52 @@
#[stable(feature = "raw_ext", since = "1.1.0")]
pub struct stat {
#[stable(feature = "raw_ext", since = "1.1.0")]
@@ -136,26 +136,30 @@
#[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_rdev: u64,
+ #[cfg(target_arch = "x86")]
++ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_atime_ext: c_long,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
pub st_atime: c_long,
#[stable(feature = "raw_ext", since = "1.1.0")]
pub st_atime_nsec: c_long,
+ #[cfg(target_arch = "x86")]
-+ pub st_mtime_ext: c_long,
#[stable(feature = "raw_ext", since = "1.1.0")]
++ pub st_mtime_ext: c_long,
++ #[stable(feature = "raw_ext", since = "1.1.0")]
pub st_mtime: c_long,
#[stable(feature = "raw_ext", since = "1.1.0")]
pub st_mtime_nsec: c_long,
+ #[cfg(target_arch = "x86")]
-+ pub st_ctime_ext: c_long,
#[stable(feature = "raw_ext", since = "1.1.0")]
++ pub st_ctime_ext: c_long,
++ #[stable(feature = "raw_ext", since = "1.1.0")]
pub st_ctime: c_long,
#[stable(feature = "raw_ext", since = "1.1.0")]
pub st_ctime_nsec: c_long,
+ #[cfg(target_arch = "x86")]
-+ pub st_birthtime_ext: c_long,
#[stable(feature = "raw_ext", since = "1.1.0")]
++ pub st_birthtime_ext: c_long,
++ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_birthtime: c_long,
+ #[stable(feature = "raw_ext", since = "1.1.0")]
+ pub st_birthtime_nsec: c_long,
@@ -163,7 +167,7 @@
pub st_size: i64,
#[stable(feature = "raw_ext", since = "1.1.0")]
pub st_blocks: i64,
-@@ -72,14 +88,7 @@
+@@ -72,14 +92,7 @@
#[stable(feature = "raw_ext", since = "1.1.0")]
pub st_flags: u32,
#[stable(feature = "raw_ext", since = "1.1.0")]
More information about the svn-ports-all
mailing list