diff options
| author | riggs <riggs@FreeBSD.org> | 2017-06-13 13:34:55 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2017-06-13 13:34:55 +0800 |
| commit | 9c46ce374a357b01add738d4a65aabb99a5de6a0 (patch) | |
| tree | 266e25b3689a4982a9eb8dfda510b3e81e48fe3e /lang | |
| parent | c0a9d1f079826720c01190e540a94394e8f0db6f (diff) | |
| download | freebsd-ports-gnome-9c46ce374a357b01add738d4a65aabb99a5de6a0.tar.gz freebsd-ports-gnome-9c46ce374a357b01add738d4a65aabb99a5de6a0.tar.zst freebsd-ports-gnome-9c46ce374a357b01add738d4a65aabb99a5de6a0.zip | |
Fix build on HEAD
Submitted by: dim, rhurlin@gwdg.de (via mail)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rust/Makefile | 7 | ||||
| -rw-r--r-- | lang/rust/files/extra-patch-ino64 | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 8ba0993396a4..c3d404e9759b 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -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 diff --git a/lang/rust/files/extra-patch-ino64 b/lang/rust/files/extra-patch-ino64 index fb15cbdd004e..5ea8fa414e55 100644 --- a/lang/rust/files/extra-patch-ino64 +++ b/lang/rust/files/extra-patch-ino64 @@ -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")] |