Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 500076) +++ head/lang/rust/Makefile (revision 500077) @@ -1,337 +1,337 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.34.0 +PORTVERSION?= 1.34.1 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ LOCAL/dumbbell/rust:rust_bootstrap \ LOCAL/tobik/rust:rust_bootstrap \ https://static.rust-lang.org/dist/:rust_bootstrap \ LOCAL/dumbbell/rust:cargo_bootstrap \ LOCAL/tobik/rust:cargo_bootstrap \ https://static.rust-lang.org/dist/:cargo_bootstrap \ https://s3.amazonaws.com/rust-lang-ci/cargo-builds/:cargo_bootstrap \ LOCAL/marino:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src DISTFILES?= ${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \ ${RUSTC_BOOTSTRAP}:rust_bootstrap \ ${RUST_STD_BOOTSTRAP}:rust_bootstrap \ ${CARGO_BOOTSTRAP}:cargo_bootstrap DIST_SUBDIR?= rust EXTRACT_ONLY?= ${DISTFILES:N*\:*bootstrap:C/:.*//} MAINTAINER= rust@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 \ MIT LICENSE_COMB= dual LICENSE_FILE_APACHE= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. BOOTSTRAPS_DATE?= 2019-02-28 RUST_BOOTSTRAP_VERSION?= 1.33.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz CARGO_BOOTSTRAP_VERSION?= 0.34.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz CARGO_VENDOR_DIR?= ${WRKSRC}/vendor RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} # Rust's target arch string is different from *BSD arch strings RUST_ARCH_aarch64= aarch64 RUST_ARCH_amd64= x86_64 RUST_ARCH_armv6= armv6 RUST_ARCH_armv7= armv7 RUST_ARCH_i386= i686 RUST_ARCH_powerpc64= powerpc64 RUST_ARCH_x86_64= x86_64 # dragonfly RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} LLVM_TARGET= ${ARCH:C/armv.*/ARM/:S/aarch64/AArch64/:S/powerpc64/PowerPC/} PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit pkgconfig python:2.7,build ssl tar:xz OPTIONS_DEFINE= DOCS GDB LLNEXTGEN SOURCES GDB_DESC= Install ports gdb (necessary for debugging rust programs) LLNEXTGEN_DESC= Build with grammar verification SOURCES_DESC= Install source files GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen # 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-* PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version .include .if ${ARCH} == powerpc64 # The bootstrap is hardcoded to use gcc8 # but we can build with a newer or older compiler as provided by USE_GCC=yes BUILD_DEPENDS+= gcc8:lang/gcc8 USE_GCC= yes .endif .if ${OPSYS} == FreeBSD && ${ARCH} == aarch64 && \ (${OSVERSION} < 1200502 || \ (${OSVERSION} > 1300000 && ${OSVERSION} < 1300006)) IGNORE= fails to run due to a bug in rtld, update to 12-STABLE r342847 or 13-CURRENT r342113 .endif .ifdef QEMU_EMULATING IGNORE= fails to build with qemu-user-static .endif X_PY_ENV= HOME="${WRKDIR}" \ LIBGIT2_SYS_USE_PKG_CONFIG=1 \ LIBSSH2_SYS_USE_PKG_CONFIG=1 \ OPENSSL_DIR="${OPENSSLBASE}" X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py RUST_STD_DIR= ${RUST_STD_BOOTSTRAP:T:R:R} post-extract: @${MKDIR} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \ ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} post-patch: @${REINPLACE_CMD} -e 's|gdb|${LOCALBASE}/bin/gdb|' \ ${WRKSRC}/src/etc/rust-gdb # If we override the versions and date of the bootstraps (for instance # on aarch64 where we provide our own bootstraps), we need to update # places where they are recorded. @${REINPLACE_CMD} -e \ 's|^date:.*|date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}|' \ ${WRKSRC}/src/stage0.txt @${REINPLACE_CMD} -e \ 's|^rustc:.*|rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}|' \ ${WRKSRC}/src/stage0.txt @${REINPLACE_CMD} -e \ 's|^cargo:.*|cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}|' \ ${WRKSRC}/src/stage0.txt # Disable vendor checksums @${REINPLACE_CMD} -e \ 's/"files":{[^}]*}/"files":{}/' \ ${CARGO_VENDOR_DIR}/*/.cargo-checksum.json post-patch-SOURCES-off: # Mimic tools in config.toml with just src excluded @${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \ ${WRKSRC}/src/bootstrap/install.rs .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) CCACHE_VALUE= "${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache" .else CCACHE_VALUE= false .endif pre-configure: @for file in \ ${CARGO_VENDOR_DIR}/backtrace-sys/src/libbacktrace/configure \ ${CARGO_VENDOR_DIR}/backtrace-sys/src/libbacktrace/config/libtool.m4; do \ mv "$$file" "$$file.dont-fix"; \ done do-configure: ${SED} -E \ -e 's,%PREFIX%,${PREFIX},' \ -e 's,%SYSCONFDIR%,${PREFIX}/etc,' \ -e 's,%MANDIR%,${MANPREFIX}/man,' \ -e 's,%PYTHON_CMD%,${PYTHON_CMD},' \ -e 's,%CHANNEL%,${RUST_CHANNEL},' \ -e 's,%TARGET%,${RUST_TARGET},' \ -e 's,%CCACHE%,${CCACHE_VALUE},' \ -e 's,%CC%,${CC},' \ -e 's,%CXX%,${CXX},' \ < ${FILESDIR}/config.toml \ > ${WRKSRC}/config.toml # no need to build a crosscompiler for these targets .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 @${REINPLACE_CMD} -e 's,^#targets =.*,targets = "${LLVM_TARGET}",' \ -e 's,^#experimental-targets =.*,experimental-targets = "",' \ ${WRKSRC}/config.toml .endif @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs post-configure: @for file in \ ${CARGO_VENDOR_DIR}/backtrace-sys/src/libbacktrace/configure \ ${CARGO_VENDOR_DIR}/backtrace-sys/src/libbacktrace/config/libtool.m4; do \ mv "$$file.dont-fix" "$$file"; \ done post-configure-DOCS-on: ${REINPLACE_CMD} -e 's,%DOCS%,true,' ${WRKSRC}/config.toml post-configure-DOCS-off: ${REINPLACE_CMD} -e 's,%DOCS%,false,' ${WRKSRC}/config.toml do-build: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ ${X_PY_CMD} build \ --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} # 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:S,^,${STAGEDIR}${PREFIX}/,}; do \ if test -f "$$f"; then \ ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \ < "$$f" \ | ${XARGS} ${RM} -r; \ ${RM} "$$f"; \ fi; \ done @for f in ${PLIST_FILES:S,^,${STAGEDIR}${PREFIX}/,}; do \ ${RM} "$$f"; \ done do-install: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ DESTDIR=${STAGEDIR} \ ${X_PY_CMD} 'install' \ --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} # 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. # # Both rustc and Cargo components install the same README.md and LICENSE # files. The install process backs up the first copy to install the # second. Thus here, we need to remove those backups. We also need to # dedup the entries in the generated PLIST, because both components' # manifests list them. # # 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:S,^,${STAGEDIR}${PREFIX}/,}; do \ ${REINPLACE_CMD} -i '' -E \ -e 's|:${STAGEDIR}|:|' \ -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \ "$$f"; \ ${ECHO_CMD} "$${f#${STAGEDIR}}" >> ${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}||\""); \ }' \ "$$f" >> ${TMPPLIST}; \ done ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/rust/*.old ${SORT} -u < ${TMPPLIST} > ${TMPPLIST}.uniq ${MV} ${TMPPLIST}.uniq ${TMPPLIST} @${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. @${FIND} ${STAGEDIR}${PREFIX}/bin -exec ${FILE} -i {} + | ${AWK} -F: \ '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} # Note that make test does not work when rust is already installed. do-test: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ ALLOW_NONZERO_RLIMIT_CORE=1 \ ${X_PY_CMD} test \ --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} makesum-all-archs: ${MAKE} makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]} ${MAKE} makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch} ${GREP} ${RUST_ARCH_${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE} ${RM} ${DISTINFO_FILE}.${arch} .endfor BOOTSTRAPS_SOURCE_PKG_FBSDVER= 10 BOOTSTRAPS_SOURCE_PKG_FBSDVER_aarch64= 11 BOOTSTRAPS_SOURCE_PKG_FBSDVER_armv6= 11 BOOTSTRAPS_SOURCE_PKG_FBSDVER_armv7= 12 BOOTSTRAPS_SOURCE_PKG_FBSDVER_powerpc64= 11 BOOTSTRAPS_SOURCE_PKG_REV= BOOTSTRAPS_SOURCE_PKG_URL= https://pkg.freebsd.org/FreeBSD:${BOOTSTRAPS_SOURCE_PKG_FBSDVER_${ARCH}:U${BOOTSTRAPS_SOURCE_PKG_FBSDVER}}:${ARCH}/latest/All/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}${BOOTSTRAPS_SOURCE_PKG_REV}.txz BOOTSTRAPS_SOURCE_PKG= ${_DISTDIR}/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${ARCH}.txz package-to-bootstraps: ${BOOTSTRAPS_SOURCE_PKG} ${MKDIR} ${WRKDIR}/bootstraps ${RM} -r ${WRKDIR}/bootstraps/usr ${EXTRACT_CMD} \ -C ${WRKDIR}/bootstraps \ --strip-components 3 \ ${EXTRACT_BEFORE_ARGS} ${BOOTSTRAPS_SOURCE_PKG} ${LOCALBASE} # `rustc` bootstrap. ${RM} -r ${WRKDIR}/bootstraps/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} ${MKDIR} ${WRKDIR}/bootstraps/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} cd ${WRKDIR}/bootstraps/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} && \ ${MKDIR} rustc/bin rustc/lib && \ ${MV} ${WRKDIR}/bootstraps/bin/rust* rustc/bin && \ ${MV} ${WRKDIR}/bootstraps/lib/*.so rustc/lib ${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \ -f ${_DISTDIR}/${RUSTC_BOOTSTRAP} \ rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} # `rust-std` bootstrap. ${RM} -r ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} ${MKDIR} ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} cd ${WRKDIR}/bootstraps/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} && \ ${MKDIR} rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} && \ ${MV} ${WRKDIR}/bootstraps/lib/rustlib/${RUST_TARGET}/lib rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET} ${TAR} -cz --format=ustar -C ${WRKDIR}/bootstraps \ -f ${_DISTDIR}/${RUST_STD_BOOTSTRAP} \ rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} ${BOOTSTRAPS_SOURCE_PKG}: ${MKDIR} ${@:H} ${FETCH_CMD} -o $@ ${BOOTSTRAPS_SOURCE_PKG_URL} .include Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo (revision 500076) +++ head/lang/rust/distinfo (revision 500077) @@ -1,39 +1,39 @@ -TIMESTAMP = 1555004553 -SHA256 (rust/rustc-1.34.0-src.tar.xz) = a510b3b7ceca370a4b395065039b2a70297e3fb4103b7ff67b1eff771fd98504 -SIZE (rust/rustc-1.34.0-src.tar.xz) = 95055768 +TIMESTAMP = 1556213482 +SHA256 (rust/rustc-1.34.1-src.tar.xz) = e0efb1e6aba0d4900de57bd2db64e32e7c5b440a95a675d5303839c9a2c3328f +SIZE (rust/rustc-1.34.1-src.tar.xz) = 95048260 SHA256 (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 142c3419b0df1bacf97bf6ed6d2d3bcb37a6439b5bf11f258178edac6e3053b3 SIZE (rust/2019-02-28/rustc-1.33.0-aarch64-unknown-freebsd.tar.gz) = 64575877 SHA256 (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = bbb2ec53d4fcade7002665d4c9c64740ddc14a07d3726555c7a2ffe01b07fd9e SIZE (rust/2019-02-28/rust-std-1.33.0-aarch64-unknown-freebsd.tar.gz) = 70714457 SHA256 (rust/2019-02-28/cargo-0.34.0-aarch64-unknown-freebsd.tar.gz) = 92bda14b874591342e7584d94a90ce0bd6532f29d638c89eaa50b9d80a8aa0fb SIZE (rust/2019-02-28/cargo-0.34.0-aarch64-unknown-freebsd.tar.gz) = 5823541 SHA256 (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8bfc7fc50c50294cf4ded35360b41b590180401a0d2e84256f5931c7c1ff35cd SIZE (rust/2019-02-28/rustc-1.33.0-x86_64-unknown-freebsd.tar.gz) = 74812594 SHA256 (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 8eec7a21a3368890fdf0b826e7bc1928775724c0a4bd14d86304cc7e48309237 SIZE (rust/2019-02-28/rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 71459727 SHA256 (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 0108a0f2e2c4663b4e5cddd5bee04fd7cf5d2c94feb3fc527254a606ee856928 SIZE (rust/2019-02-28/cargo-0.34.0-x86_64-unknown-freebsd.tar.gz) = 6358006 SHA256 (rust/2019-02-28/rustc-1.33.0-armv6-unknown-freebsd.tar.gz) = 9119a1c743c0dda2d65727e6436f453ab85428c7587d623e21b473e4df44a3ba SIZE (rust/2019-02-28/rustc-1.33.0-armv6-unknown-freebsd.tar.gz) = 67496083 SHA256 (rust/2019-02-28/rust-std-1.33.0-armv6-unknown-freebsd.tar.gz) = 29ac9b289ae493b6ae5efb2c3dd8bf367466b8f0573007e92d020743eab3d607 SIZE (rust/2019-02-28/rust-std-1.33.0-armv6-unknown-freebsd.tar.gz) = 72846229 SHA256 (rust/2019-02-28/cargo-0.34.0-armv6-unknown-freebsd.tar.gz) = 3f518ce75bdc1b7ed2c600a5a6e6f522d608efe66d0dbff442cad16fd68d36e7 SIZE (rust/2019-02-28/cargo-0.34.0-armv6-unknown-freebsd.tar.gz) = 5993902 SHA256 (rust/2019-02-28/rustc-1.33.0-armv7-unknown-freebsd.tar.gz) = 9649fa7830648725143dff25e40f1edcacbd50f76a63c84d9b45f264705d2f9a SIZE (rust/2019-02-28/rustc-1.33.0-armv7-unknown-freebsd.tar.gz) = 66337581 SHA256 (rust/2019-02-28/rust-std-1.33.0-armv7-unknown-freebsd.tar.gz) = 3848af717da0a5b87925d34524b74f76225167ea0261fc2c6d6627115469e4e9 SIZE (rust/2019-02-28/rust-std-1.33.0-armv7-unknown-freebsd.tar.gz) = 72078355 SHA256 (rust/2019-02-28/cargo-0.34.0-armv7-unknown-freebsd.tar.gz) = 7b6c04ec6eddc09367e9b720c8a126363ecbf4c6d787490498a133e8bdec3c4b SIZE (rust/2019-02-28/cargo-0.34.0-armv7-unknown-freebsd.tar.gz) = 5036799 SHA256 (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = f788ef1806f6e51c7df05dc2614f8b95d3d1a59177786dc9c895c16c0d5201aa SIZE (rust/2019-02-28/rustc-1.33.0-i686-unknown-freebsd.tar.gz) = 76140989 SHA256 (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 00325440bf2c832f9063042bf8999756466cec23f747b62ad3268a316dae39a9 SIZE (rust/2019-02-28/rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 72221278 SHA256 (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 7943c30e3451972ed1a99f26b079c53a1a7317f63ff60cca1ceeebb80a99dc66 SIZE (rust/2019-02-28/cargo-0.34.0-i686-unknown-freebsd.tar.gz) = 6134900 SHA256 (rust/2019-02-28/rustc-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 1ad1e9a0ae5fbc279c7ca5079d80bfd6d8e7861811a689902ca83c95fe92b011 SIZE (rust/2019-02-28/rustc-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 74228636 SHA256 (rust/2019-02-28/rust-std-1.33.0-powerpc64-unknown-freebsd.tar.gz) = fbd83a5d73329f82180922e4da0aeef529a5c834e5446f7befadb69db2b968f7 SIZE (rust/2019-02-28/rust-std-1.33.0-powerpc64-unknown-freebsd.tar.gz) = 74552190 SHA256 (rust/2019-02-28/cargo-0.34.0-powerpc64-unknown-freebsd.tar.gz) = 5bedf357c0ce018f85cbea6ba5f9c380602761ebca295e264afc4fbf92766c68 SIZE (rust/2019-02-28/cargo-0.34.0-powerpc64-unknown-freebsd.tar.gz) = 6960371 Index: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_arm.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_arm.rs (nonexistent) +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_arm.rs (revision 500077) @@ -0,0 +1,30 @@ +--- src/stdsimd/crates/std_detect/src/detect/os/freebsd/arm.rs.orig 2019-04-25 17:33:21 UTC ++++ src/stdsimd/crates/std_detect/src/detect/os/freebsd/arm.rs +@@ -0,0 +1,27 @@ ++//! Run-time feature detection for ARM on FreeBSD ++ ++use crate::detect::{Feature, cache}; ++use super::{auxvec}; ++ ++/// Performs run-time feature detection. ++#[inline] ++pub fn check_for(x: Feature) -> bool { ++ cache::test(x as u32, detect_features) ++} ++ ++/// Try to read the features from the auxiliary vector ++fn detect_features() -> cache::Initializer { ++ let mut value = cache::Initializer::default(); ++ let enable_feature = |value: &mut cache::Initializer, f, enable| { ++ if enable { ++ value.set(f as u32); ++ } ++ }; ++ ++ if let Ok(auxv) = auxvec::auxv() { ++ enable_feature(&mut value, Feature::neon, auxv.hwcap & 0x00001000 != 0); ++ enable_feature(&mut value, Feature::pmull, auxv.hwcap2 & 0x00000002 != 0); ++ return value; ++ } ++ value ++} Property changes on: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_arm.rs ___________________________________________________________________ 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/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs (nonexistent) +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs (revision 500077) @@ -0,0 +1,89 @@ +--- src/stdsimd/crates/std_detect/src/detect/os/freebsd/auxvec.rs.orig 2019-04-25 17:33:21 UTC ++++ src/stdsimd/crates/std_detect/src/detect/os/freebsd/auxvec.rs +@@ -0,0 +1,86 @@ ++//! Parses ELF auxiliary vectors. ++#![cfg_attr(any(target_arch = "arm", target_arch = "powerpc64"), allow(dead_code))] ++ ++/// Key to access the CPU Hardware capabilities bitfield. ++pub(crate) const AT_HWCAP: usize = 25; ++/// Key to access the CPU Hardware capabilities 2 bitfield. ++pub(crate) const AT_HWCAP2: usize = 26; ++ ++/// Cache HWCAP bitfields of the ELF Auxiliary Vector. ++/// ++/// If an entry cannot be read all the bits in the bitfield are set to zero. ++/// This should be interpreted as all the features being disabled. ++#[derive(Debug, Copy, Clone)] ++pub(crate) struct AuxVec { ++ pub hwcap: usize, ++ pub hwcap2: usize, ++} ++ ++/// ELF Auxiliary Vector ++/// ++/// The auxiliary vector is a memory region in a running ELF program's stack ++/// composed of (key: usize, value: usize) pairs. ++/// ++/// The keys used in the aux vector are platform dependent. For FreeBSD, they are ++/// defined in [sys/elf_common.h][elf_common_h]. The hardware capabilities of a given ++/// CPU can be queried with the `AT_HWCAP` and `AT_HWCAP2` keys. ++/// ++/// Note that run-time feature detection is not invoked for features that can ++/// be detected at compile-time. ++/// ++/// [elf_common.h]: https://svnweb.freebsd.org/base/release/12.0.0/sys/sys/elf_common.h?revision=341707 ++pub(crate) fn auxv() -> Result { ++ if let Ok(hwcap) = archauxv(AT_HWCAP) { ++ if let Ok(hwcap2) = archauxv(AT_HWCAP2) { ++ if hwcap != 0 && hwcap2 != 0 { ++ return Ok(AuxVec { hwcap, hwcap2 }); ++ } ++ } ++ } ++ Err(()) ++} ++ ++/// Tries to read the `key` from the auxiliary vector. ++fn archauxv(key: usize) -> Result { ++ use mem; ++ ++ #[derive (Copy, Clone)] ++ #[repr(C)] ++ pub struct Elf_Auxinfo { ++ pub a_type: usize, ++ pub a_un: unnamed, ++ } ++ #[derive (Copy, Clone)] ++ #[repr(C)] ++ pub union unnamed { ++ pub a_val: libc::c_long, ++ pub a_ptr: *mut libc::c_void, ++ pub a_fcn: Option ()>, ++ } ++ ++ let mut auxv: [Elf_Auxinfo; 27] = ++ [Elf_Auxinfo{a_type: 0, a_un: unnamed{a_val: 0,},}; 27]; ++ ++ let mut len: libc::c_uint = mem::size_of_val(&auxv) as libc::c_uint; ++ ++ unsafe { ++ let mut mib = [libc::CTL_KERN, libc::KERN_PROC, libc::KERN_PROC_AUXV, libc::getpid()]; ++ ++ let ret = libc::sysctl(mib.as_mut_ptr(), ++ mib.len() as u32, ++ &mut auxv as *mut _ as *mut _, ++ &mut len as *mut _ as *mut _, ++ 0 as *mut libc::c_void, ++ 0, ++ ); ++ ++ if ret != -1 { ++ for i in 0..auxv.len() { ++ if auxv[i].a_type == key { ++ return Ok(auxv[i].a_un.a_val as usize); ++ } ++ } ++ } ++ } ++ return Ok(0); ++} Property changes on: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_auxvec.rs ___________________________________________________________________ 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/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs (nonexistent) +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs (revision 500077) @@ -0,0 +1,20 @@ +--- src/stdsimd/crates/std_detect/src/detect/os/freebsd/mod.rs.orig 2019-04-24 21:07:30 UTC ++++ src/stdsimd/crates/std_detect/src/detect/os/freebsd/mod.rs +@@ -1,9 +1,17 @@ + //! Run-time feature detection on FreeBSD + ++mod auxvec; ++ + cfg_if! { + if #[cfg(target_arch = "aarch64")] { + mod aarch64; + pub use self::aarch64::check_for; ++ } else if #[cfg(target_arch = "arm")] { ++ mod arm; ++ pub use self::arm::check_for; ++ } else if #[cfg(target_arch = "powerpc64")] { ++ mod powerpc; ++ pub use self::powerpc::check_for; + } else { + use arch::detect::Feature; + /// Performs run-time feature detection. Property changes on: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_mod.rs ___________________________________________________________________ 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/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_powerpc.rs =================================================================== --- head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_powerpc.rs (nonexistent) +++ head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_powerpc.rs (revision 500077) @@ -0,0 +1,30 @@ +--- src/stdsimd/crates/std_detect/src/detect/os/freebsd/powerpc.rs.orig 2019-04-25 17:33:21 UTC ++++ src/stdsimd/crates/std_detect/src/detect/os/freebsd/powerpc.rs +@@ -0,0 +1,27 @@ ++//! Run-time feature detection for PowerPC on FreeBSD. ++ ++use crate::detect::{Feature, cache}; ++use super::{auxvec}; ++ ++/// Performs run-time feature detection. ++#[inline] ++pub fn check_for(x: Feature) -> bool { ++ cache::test(x as u32, detect_features) ++} ++ ++fn detect_features() -> cache::Initializer { ++ let mut value = cache::Initializer::default(); ++ let enable_feature = |value: &mut cache::Initializer, f, enable| { ++ if enable { ++ value.set(f as u32); ++ } ++ }; ++ ++ if let Ok(auxv) = auxvec::auxv() { ++ enable_feature(&mut value, Feature::altivec, auxv.hwcap & 0x10000000 != 0); ++ enable_feature(&mut value, Feature::vsx, auxv.hwcap & 0x00000080 != 0); ++ enable_feature(&mut value, Feature::power8, auxv.hwcap2 & 0x80000000 != 0); ++ return value; ++ } ++ value ++} Property changes on: head/lang/rust/files/patch-src_stdsimd_crates_std__detect_src_detect_os_freebsd_powerpc.rs ___________________________________________________________________ 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