Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 441842) +++ head/lang/rust/Makefile (revision 441843) @@ -1,227 +1,243 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust PORTVERSION?= 1.17.0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ https://static.rust-lang.org/dist/:rust_bootstrap \ https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap \ LOCAL/marino:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src BOOTSTRAP_FILES=${RUSTC_BOOTSTRAP}:rust_bootstrap \ ${RUST_STD_BOOTSTRAP}:rust_bootstrap \ ${CARGO_BOOTSTRAP}:cargo_bootstrap DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:src \ ${BOOTSTRAP_FILES} .if !defined(SKIP_CARGO_REGISTRY) MASTER_SITES+= LOCAL/riggs/rust:registry \ LOCAL/dumbbell/rust:registry DISTFILES+= ${CARGO_REGISTRY}:registry .endif DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:*bootstrap:C/:.*//} MAINTAINER?= riggs@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 \ MIT LICENSE_COMB= dual # APACHE20 license is standard, see Templates/Licenses/APACHE20 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= cmake:devel/cmake ONLY_FOR_ARCHS?= amd64 i386 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler # FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of # the LDFLAGS. When stage0's rustc is linked, it picks the installed # librust*so and fails. CONFLICTS_BUILD?= rust-nightly CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly RUST_BOOTSTRAP_DIR?= 2017-03-11 RUST_BOOTSTRAP_VERSION?= 1.16.0 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 CARGO_BOOTSTRAP_DIR?= 6b05583d71f982bcad049b9fa094c637c062e751 CARGO_BOOTSTRAP_VERSION?= nightly CARGO_BOOTSTRAP= ${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz CARGO_REGISTRY= ${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} # Rust's target arch string is different from *BSD arch strings RUST_ARCH_x86_64= x86_64 # dragonfly RUST_ARCH_amd64= x86_64 RUST_ARCH_i386= i686 RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit python:2,build HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-valgrind \ ${CHOSEN_COMPILER_TYPE:Mclang:C/.+/--enable-&/} \ --prefix=${PREFIX} \ --musl-root=${PREFIX} \ --local-rust-root=${PREFIX} \ --mandir=${MANPREFIX}/man \ --release-channel=${RUST_CHANNEL} MAKE_ARGS+= VERBOSE=1 OPTIONS_DEFINE= DOCS GDB LLNEXTGEN PORT_LLVM GDB_DESC= Install ports gdb (necessary for debugging rust programs) LLNEXTGEN_DESC= Build with grammar verification DOCS_CONFIGURE_ENABLE= docs GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen # Rust may pass more regression tests with bundled LLVM PORT_LLVM_DESC= Build against devel/llvm${LLVM_VER} instead of bundled version PORT_LLVM_BUILD_DEPENDS= ${LLVM_PREFIX}/bin/FileCheck:devel/llvm${LLVM_VER} PORT_LLVM_CONFIGURE_ON= --llvm-root=${LLVM_PREFIX} LLVM_VER?= 40 LLVM_PREFIX= ${LOCALBASE}/llvm${LLVM_VER} # Note that make test does not work when rust is already installed TEST_TARGET= check TEST_ENV+= ALLOW_NONZERO_RLIMIT_CORE=1 # Rust manifests list all files and directories installed by rust-installer. # We use them in: # - pre-install to cleanup the ${STAGEDIR} # - post-install to populate the ${TMPPLIST} RUST_MANIFESTS= lib/rustlib/manifest-rustc \ lib/rustlib/manifest-rust-std-${RUST_TARGET} RUST_DOCS_MANIFESTS= lib/rustlib/manifest-rust-docs DOCS_VARS= rust_manifests+=${RUST_DOCS_MANIFESTS} PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version +.include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ino64 +.endif + pre-fetch: # FIXME: This is the same check for CONFLICTS as the standard # one, except port origins are not compared. This allows # the port to conflict with itself, because Rust would pick # installed Rust libraries instead of freshly built ones. @conflicts_with=$$( \ { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ for entry in $${conflicts_with}; do \ ${ECHO_MSG} " $${entry}"; \ done; \ ${ECHO_MSG}; \ ${ECHO_MSG} " They will not build together."; \ ${ECHO_MSG} " Please remove them first with pkg delete."; \ exit 1;\ fi +LIBSTD= rust-std-1.16.0-x86_64-unknown-freebsd/rust-std-x86_64-unknown-freebsd/lib/rustlib/x86_64-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib +STDF= std-aef6cb139bd07bdc.0.o + post-extract: @${MKDIR} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \ ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} - ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \ - ${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \ ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR} + ${TAR} -x -C ${WRKSRC} -f ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 + ${CC} ${CFLAGS} -fPIC -c -o ${WRKSRC}/old_fstat.o ${FILESDIR}/old_fstat.c + (cd ${WRKSRC} && ${AR} x ${WRKSRC}/${LIBSTD} ${STDF}) + ${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-x86_64-unknown-freebsd + ${MV} ${WRKSRC}/rustc.tbz ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP} +.endif post-patch: @test ! -f ${WRKSRC}/mk/main.mk || \ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mk/main.mk @${REINPLACE_CMD} -e 's|gdb|${LOCALBASE}/bin/gdb|' \ ${WRKSRC}/src/etc/rust-gdb # In case the previous "make stage" failed, this ensures rust's # install.sh won't backup previously staged files before reinstalling # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: @for f in ${RUST_MANIFESTS} ${RUST_DOCS_MANIFESTS}; do \ if test -f "${STAGEDIR}${PREFIX}/$$f"; then \ ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \ < "${STAGEDIR}${PREFIX}/$$f" \ | ${XARGS} ${RM} -r; \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ fi; \ done @for f in ${PLIST_FILES}; do \ ${RM} "${STAGEDIR}${PREFIX}/$$f"; \ done # In post-install, we use the manifests generated during Rust install # to in turn generate the PLIST. We do that, instead of the regular # `pkg-plist`, because several libraries have a computed filename based # on the absolute path of the source files. As it is user-specific, we # can't know their filename in advance. # # We fix manpage entries in the generated manifests because Rust # installs them uncompressed but the Ports framework compresses them. post-install: for f in ${RUST_MANIFESTS}; do \ ${REINPLACE_CMD} -E \ -e 's|:${STAGEDIR}|:|' \ -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \ ${STAGEDIR}${PREFIX}/$$f; \ ${RM} ${STAGEDIR}${PREFIX}/$$f.bak; \ ${ECHO} "${PREFIX}/$$f" >> ${TMPPLIST}; \ ${AWK} '\ /^file:/ { \ file=$$0; \ sub(/^file:/, "", file); \ print file; \ } \ /^dir:/ { \ dir=$$0; \ sub(/^dir:/, "", dir); \ system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \ }' \ ${STAGEDIR}${PREFIX}/$$f >> ${TMPPLIST}; \ done @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped, # but they contain non-object files which make strip(1) unhappy. @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so -.include +.include # "make gen-registry" is a special target to ease this port update. # # After changing the version number and the Git revision, you can run # "make gen-registry" to update the distinfo and create a new snapshot of # the registry. The new registry is written to ${DISTDIR} and can be # uploaded. gen-registry: ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY makesum ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY ${TAR} cJvf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_REGISTRY} -C${WRKDIR} \ --uid 0 --gid 0 \ --exclude 'src/*/benches/' \ --exclude 'src/*/ci/' \ --exclude 'src/*/examples/' \ --exclude 'src/*/tests/' \ --exclude 'index/github.com-*/.git/' \ .cargo ${MAKE} -C${.CURDIR} makesum Index: head/lang/rust/files/extra-patch-ino64 =================================================================== --- head/lang/rust/files/extra-patch-ino64 (nonexistent) +++ head/lang/rust/files/extra-patch-ino64 (revision 441843) @@ -0,0 +1,313 @@ +--- ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2017-04-24 18:56:45.000000000 +0000 ++++ ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs 2017-05-25 16:28:37.280076000 +0000 +@@ -1,8 +1,8 @@ + pub type fflags_t = u32; + pub type clock_t = i32; +-pub type ino_t = u32; ++pub type ino_t = u64; + pub type lwpid_t = i32; +-pub type nlink_t = u16; ++pub type nlink_t = u64; + pub type blksize_t = u32; + pub type clockid_t = ::c_int; + pub type sem_t = _sem; +@@ -40,10 +40,13 @@ + } + + pub struct dirent { +- pub d_fileno: u32, ++ pub d_fileno: u64, ++ pub d_off: u64, + pub d_reclen: u16, + pub d_type: u8, +- pub d_namlen: u8, ++ pub d_pad0: u8, ++ pub d_namlen: u16, ++ pub d_pad1: u16, + pub d_name: [::c_char; 256], + } + +--- ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2017-04-24 18:56:45.000000000 +0000 ++++ ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs 2017-05-25 16:25:42.303616000 +0000 +@@ -7,25 +7,30 @@ + pub struct stat { + pub st_dev: ::dev_t, + pub st_ino: ::ino_t, +- pub st_mode: ::mode_t, + pub st_nlink: ::nlink_t, ++ pub st_mode: ::mode_t, ++ pub st_pad0: ::uint16_t, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: ::uint32_t, + pub st_rdev: ::dev_t, ++ pub st_atime_ext ::i32, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, ++ pub st_mtime_ext ::i32, + pub st_mtime: ::time_t, + pub st_mtime_nsec: ::c_long, ++ pub st_ctime_ext ::i32, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime_ext ::i32, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, + pub st_size: ::off_t, + pub st_blocks: ::blkcnt_t, + pub st_blksize: ::blksize_t, + pub st_flags: ::fflags_t, +- pub st_gen: ::uint32_t, +- pub st_lspare: ::int32_t, +- pub st_birthtime: ::time_t, +- pub st_birthtime_nsec: ::c_long, +- __unused: [u8; 8], ++ pub st_gen: ::uint64_t, ++ pub st_lspare: [::uint64_t; 10], + } + } +--- ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2017-04-24 18:56:45.000000000 +0000 ++++ ./src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs 2017-05-25 16:25:42.303910000 +0000 +@@ -7,10 +7,12 @@ + pub struct stat { + pub st_dev: ::dev_t, + pub st_ino: ::ino_t, +- pub st_mode: ::mode_t, + pub st_nlink: ::nlink_t, ++ pub st_mode: ::mode_t, ++ pub st_pad0: ::uint16_t, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: ::uint32_t, + pub st_rdev: ::dev_t, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, +@@ -18,13 +20,13 @@ + pub st_mtime_nsec: ::c_long, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, + pub st_size: ::off_t, + pub st_blocks: ::blkcnt_t, + pub st_blksize: ::blksize_t, + pub st_flags: ::fflags_t, +- pub st_gen: ::uint32_t, +- pub st_lspare: ::int32_t, +- pub st_birthtime: ::time_t, +- pub st_birthtime_nsec: ::c_long, ++ pub st_gen: ::uint64_t, ++ pub st_spare: [::int64_t; 10], + } + } +--- ./src/liblibc/src/unix/bsd/freebsdlike/mod.rs.orig 2017-04-24 18:56:45.000000000 +0000 ++++ ./src/liblibc/src/unix/bsd/freebsdlike/mod.rs 2017-05-25 16:25:42.304391000 +0000 +@@ -1,4 +1,4 @@ +-pub type dev_t = u32; ++pub type dev_t = u64; + pub type mode_t = u16; + pub type pthread_attr_t = *mut ::c_void; + 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 @@ + #[stable(feature = "raw_ext", since = "1.1.0")] + pub struct stat { + #[stable(feature = "raw_ext", since = "1.1.0")] +- pub st_dev: u32, ++ pub st_dev: u64, + #[stable(feature = "raw_ext", since = "1.1.0")] +- pub st_ino: u32, ++ pub st_ino: u64, + #[stable(feature = "raw_ext", since = "1.1.0")] ++ pub st_nlink: u64, ++ #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_mode: u16, + #[stable(feature = "raw_ext", since = "1.1.0")] +- pub st_nlink: u16, ++ pub st_pad0: u16, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_uid: u32, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_gid: u32, + #[stable(feature = "raw_ext", since = "1.1.0")] +- pub st_rdev: u32, ++ pub st_pad1: u32, + #[stable(feature = "raw_ext", since = "1.1.0")] ++ pub st_rdev: u64, ++ #[cfg(target_arch = "x86")] ++ 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: 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: 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: c_long, ++ #[stable(feature = "raw_ext", since = "1.1.0")] ++ pub st_birthtime_nsec: c_long, ++ #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_size: i64, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_blocks: i64, +@@ -72,14 +88,7 @@ + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_flags: u32, + #[stable(feature = "raw_ext", since = "1.1.0")] +- pub st_gen: u32, ++ pub st_gen: u64, + #[stable(feature = "raw_ext", since = "1.1.0")] +- pub st_lspare: i32, +- #[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, +- #[cfg(target_arch = "x86")] +- #[stable(feature = "raw_ext", since = "1.1.0")] +- pub __unused: [u8; 8], ++ pub st_spare: [u64; 10], + } +--- ./src/libstd/os/freebsd/fs.rs.orig 2017-04-24 18:53:46.000000000 +0000 ++++ ./src/libstd/os/freebsd/fs.rs 2017-05-25 16:25:42.304989000 +0000 +@@ -74,8 +74,6 @@ + fn st_flags(&self) -> u32; + #[stable(feature = "metadata_ext2", since = "1.8.0")] + fn st_gen(&self) -> u32; +- #[stable(feature = "metadata_ext2", since = "1.8.0")] +- fn st_lspare(&self) -> u32; + } + + #[stable(feature = "metadata_ext", since = "1.1.0")] +@@ -146,9 +144,6 @@ + } + fn st_flags(&self) -> u32 { + self.as_inner().as_inner().st_flags as u32 +- } +- fn st_lspare(&self) -> u32 { +- self.as_inner().as_inner().st_lspare as u32 + } + } + +--- ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2017-04-24 20:20:26.000000000 +0000 ++++ ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs 2017-05-25 16:25:42.305261000 +0000 +@@ -7,10 +7,12 @@ + pub struct stat { + pub st_dev: ::dev_t, + pub st_ino: ::ino_t, +- pub st_mode: ::mode_t, + pub st_nlink: ::nlink_t, ++ pub st_mode: ::mode_t, ++ pub st_pad0: u16, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: ::u32, + pub st_rdev: ::dev_t, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, +@@ -18,13 +20,13 @@ + pub st_mtime_nsec: ::c_long, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, + pub st_size: ::off_t, + pub st_blocks: ::blkcnt_t, + pub st_blksize: ::blksize_t, + pub st_flags: ::fflags_t, +- pub st_gen: ::uint32_t, +- pub st_lspare: ::int32_t, +- pub st_birthtime: ::time_t, +- pub st_birthtime_nsec: ::c_long, ++ pub st_gen: ::uint64_t, ++ pub st_spare: [u64; 10], + } + } +--- ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2017-04-24 20:20:26.000000000 +0000 ++++ ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs 2017-05-25 16:28:29.708287000 +0000 +@@ -1,8 +1,8 @@ + pub type fflags_t = u32; + pub type clock_t = i32; +-pub type ino_t = u32; ++pub type ino_t = u64; + pub type lwpid_t = i32; +-pub type nlink_t = u16; ++pub type nlink_t = u64; + pub type blksize_t = u32; + pub type clockid_t = ::c_int; + pub type sem_t = _sem; +@@ -40,10 +40,13 @@ + } + + pub struct dirent { +- pub d_fileno: u32, ++ pub d_fileno: u64, ++ pub d_off: u64, + pub d_reclen: u16, + pub d_type: u8, +- pub d_namlen: u8, ++ pub d_pad0: u8, ++ pub d_namlen: u16, ++ pub d_pad1: u16, + pub d_name: [::c_char; 256], + } + +--- ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2017-04-24 20:20:26.000000000 +0000 ++++ ./src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs 2017-05-25 16:25:42.305967000 +0000 +@@ -7,25 +7,30 @@ + pub struct stat { + pub st_dev: ::dev_t, + pub st_ino: ::ino_t, +- pub st_mode: ::mode_t, + pub st_nlink: ::nlink_t, ++ pub st_mode: ::mode_t, ++ pub st_pad0: u16, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: u32, + pub st_rdev: ::dev_t, ++ pub st_atime_ext: ::i32, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, ++ pub st_mtime_ext: ::i32, + pub st_mtime: ::time_t, + pub st_mtime_nsec: ::c_long, ++ pub st_ctime_ext: ::i32, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime_ext: ::i32, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, + pub st_size: ::off_t, + pub st_blocks: ::blkcnt_t, + pub st_blksize: ::blksize_t, + pub st_flags: ::fflags_t, +- pub st_gen: ::uint32_t, +- pub st_lspare: ::int32_t, +- pub st_birthtime: ::time_t, +- pub st_birthtime_nsec: ::c_long, +- __unused: [u8; 8], ++ pub st_gen: ::uint64_t, ++ pub st_spare: [u64; 10], + } + } +--- ./src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2017-04-24 20:20:26.000000000 +0000 ++++ ./src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs 2017-05-25 16:25:42.306480000 +0000 +@@ -1,4 +1,4 @@ +-pub type dev_t = u32; ++pub type dev_t = u64; + pub type mode_t = u16; + pub type pthread_attr_t = *mut ::c_void; + pub type rlim_t = i64; Property changes on: head/lang/rust/files/extra-patch-ino64 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/rust/files/old_fstat.c =================================================================== --- head/lang/rust/files/old_fstat.c (nonexistent) +++ head/lang/rust/files/old_fstat.c (revision 441843) @@ -0,0 +1,103 @@ +/* $FreeBSD$ */ + +#include +#include +#include +#include +#include + +struct stat; + +int +fstat(int fd, struct stat *sb) +{ + + return (syscall(SYS_freebsd11_fstat, fd, sb)); +} + +int +stat(const char *path, struct stat *sb) +{ + + return (syscall(SYS_freebsd11_stat, path, sb)); +} + +int +lstat(const char *path, struct stat *sb) +{ + + return (syscall(SYS_freebsd11_lstat, path, sb)); +} + +int +fstatat(int fd, const char *path, struct stat *sb, int flag) +{ + + return (syscall(SYS_freebsd11_fstatat, fd, path, sb, flag)); +} + +struct ODIR; +struct freebsd11_dirent; + +/* +__asm(".symver old_readdir, readdir@FBSD_1.0"); +int old_readdir(struct ODIR *); +int +readdir(struct ODIR *dirp) +{ + + return (old_readdir(dirp)); +} +*/ + +__asm(".symver old_readdir_r, readdir_r@FBSD_1.0"); +int old_readdir_r(struct ODIR *, struct freebsd11_dirent *, + struct freebsd11_dirent **); +int +readdir_r(struct ODIR *dirp, struct freebsd11_dirent *entry, + struct freebsd11_dirent **result) +{ + void *libc; + void *fptr; + int error; + + libc = dlopen("libc.so.7", RTLD_LAZY | RTLD_GLOBAL); + if (libc == NULL) { + fprintf(stderr, "libc open: %s\n", dlerror()); + abort(); + } + fptr = dlvsym(libc, "readdir_r", "FBSD_1.0"); + if (fptr == NULL) { + fprintf(stderr, "readdir_r: %s\n", dlerror()); + abort(); + } + error = ((int (*)(struct ODIR *, struct freebsd11_dirent *, + struct freebsd11_dirent **))fptr)(dirp, entry, result); + dlclose(libc); + return (error); +} + +/* +__asm(".symver old_scandir, scandir@FBSD_1.0"); +int old_scandir(const char *, struct freebsd11_dirent ***, + int (*)(const struct freebsd11_dirent *), + int (*)(const struct freebsd11_dirent **, + const struct freebsd11_dirent **)); +int +scandir(const char *dirname, struct freebsd11_dirent ***namelist, + int (*select)(const struct freebsd11_dirent *), + int (*dcomp)(const struct freebsd11_dirent **, + const struct freebsd11_dirent **)) +{ + + return (old_scandir(dirname, namelist, select, dcomp)); +} +*/ + +struct old_statfs; +int +fstatfs(int fd, struct old_statfs *buf) +{ + + return (syscall(SYS_freebsd11_fstatfs, fd, buf)); +} Property changes on: head/lang/rust/files/old_fstat.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property