Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 474977) +++ head/lang/rust/Makefile (revision 474978) @@ -1,381 +1,383 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.26.2 +PORTVERSION?= 1.27.1 PORTREVISION?= CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ LOCAL/dumbbell/rust:rust_bootstrap \ https://static.rust-lang.org/dist/:rust_bootstrap \ LOCAL/dumbbell/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 # APACHE20 license is standard, see Templates/Licenses/APACHE20 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libssh2.so:security/libssh2 ONLY_FOR_ARCHS?= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler +BROKEN_aarch64= fails to build: bootstrap compiler crashes + # 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 # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2018-03-29 +BOOTSTRAPS_DATE?= 2018-05-10 -RUST_BOOTSTRAP_VERSION?= 1.25.0 +RUST_BOOTSTRAP_VERSION?= 1.26.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.26.0 +CARGO_BOOTSTRAP_VERSION?= 0.27.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz 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_i386= i686 RUST_ARCH_x86_64= x86_64 # dragonfly RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} 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-cargo \ lib/rustlib/manifest-rls-preview \ lib/rustlib/manifest-rustc \ lib/rustlib/manifest-rustfmt-preview \ lib/rustlib/manifest-rust-analysis-${RUST_TARGET} \ lib/rustlib/manifest-rust-std-${RUST_TARGET} RUST_DOCS_MANIFEST= lib/rustlib/manifest-rust-docs RUST_SRC_MANIFEST= lib/rustlib/manifest-rust-src DOCS_VARS= rust_manifests+=${RUST_DOCS_MANIFEST} SOURCES_VARS= rust_manifests+=${RUST_SRC_MANIFEST} PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version .include 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 \ src/vendor/lzma-sys 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 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 # After patching crates, we need to update their corresponding # `.cargo-checksum.json` to reflect the new checksums verified by Cargo. @for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/openssl" "${WRKSRC}/src/vendor/openssl-sys"; do \ if ! test -d "$$dir"; then \ continue; \ fi; \ cd "$$dir"; \ for file in $$(${FIND} * -name "*.orig"); do \ old_checksum=$$(${SHA256} -q "$$file"); \ new_checksum=$$(${SHA256} -q "$${file%%.orig}"); \ regex="$$regex -e s|\"$${file%%.orig}\":\"$$old_checksum\"|\"$${file%%.orig}\":\"$$new_checksum\"|"; \ done; \ if test "$$regex"; then \ ${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \ fi; \ done # We make a backup of a few files before the FreeBSD 10 autotools # fix is applied. We'll need them in `do-configure` to update the # `.cargo-checksum.json` files. @for crate in ${CRATES_PATCHED_BY_FBSD10_FIX}; do \ if ! test -d "${WRKSRC}/$$crate"; then \ continue; \ fi; \ for file in $$(${FIND} "${WRKSRC}/$$crate" -name "config.rpath"); do \ ${CP} "$$file" "$$file.orig"; \ done; \ done .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) CCACHE_VALUE= "${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,}/bin/ccache" .else CCACHE_VALUE= false .endif 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},' \ < ${FILESDIR}/config.toml \ > ${WRKSRC}/config.toml # The FreeBSD 10 autotools fix may modify some files just before # `do-configure`. Like after `extra-path-ino64`, we need to update # `.cargo-checksum.json`. @for crate in ${CRATES_PATCHED_BY_FBSD10_FIX}; do \ if ! test -d "${WRKSRC}/$$crate"; then \ continue; \ fi; \ cd "${WRKSRC}/$$crate"; \ for file in $$(${FIND} * -name "*.orig"); do \ old_checksum=$$(${SHA256} -q "$$file"); \ new_checksum=$$(${SHA256} -q "$${file%%.orig}"); \ regex="$$regex -e s|\"$${file%%.orig}\":\"$$old_checksum\"|\"$${file%%.orig}\":\"$$new_checksum\"|"; \ done; \ if test "$$regex"; then \ ${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \ fi; \ 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} ${RUST_DOCS_MANIFEST} ${RUST_SRC_MANIFEST}; 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 do-install: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ DESTDIR=${STAGEDIR} \ - ${X_PY_CMD} install \ + ${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}; 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}/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. @${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/bin/cargo \ ${STAGEDIR}${PREFIX}/bin/cargo-fmt \ ${STAGEDIR}${PREFIX}/bin/rls \ ${STAGEDIR}${PREFIX}/bin/rustc \ ${STAGEDIR}${PREFIX}/bin/rustdoc \ ${STAGEDIR}${PREFIX}/bin/rustfmt \ ${STAGEDIR}${PREFIX}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/rustlib/*/codegen-backends/*.so # We set `extended = true` in config.toml because we want to build # Cargo at the same time. However, this installs the rust-src component # as well. If the user doesn't want that, I don't know how to prevent # its install. So for now, use the rust-src manifest to remove it from # ${STAGEDIR}. post-install-SOURCES-off: if test -f "${STAGEDIR}${PREFIX}/${RUST_SRC_MANIFEST}"; then \ ${SED} -E -e 's,^(file|dir):,,' \ < "${STAGEDIR}${PREFIX}/${RUST_SRC_MANIFEST}" \ | ${XARGS} ${RM} -r; \ ${RM} "${STAGEDIR}${PREFIX}/${RUST_SRC_MANIFEST}"; \ ${RM} -r "${STAGEDIR}${PREFIX}/lib/rustlib/src"; \ fi # 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:[1]} -.for arch in ${ONLY_FOR_ARCHS:[2..-1]} + ${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_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 474977) +++ head/lang/rust/distinfo (revision 474978) @@ -1,21 +1,21 @@ -TIMESTAMP = 1528500986 -SHA256 (rust/rustc-1.26.2-src.tar.xz) = a1202800bd5621f5cac027177904da0b964eb43b93606d3e4c7b342a9f7473b4 -SIZE (rust/rustc-1.26.2-src.tar.xz) = 54613640 -SHA256 (rust/2018-03-29/rustc-1.25.0-aarch64-unknown-freebsd.tar.gz) = bef48b3ba5d560ae2eae532bfa4858827cd90687684e42ba515cb6dd78348ea9 -SIZE (rust/2018-03-29/rustc-1.25.0-aarch64-unknown-freebsd.tar.gz) = 62374768 -SHA256 (rust/2018-03-29/rust-std-1.25.0-aarch64-unknown-freebsd.tar.gz) = 994e415d2bec4c862cede93ca8f50fdc30272930170d30d963f5f9e127f8e60b -SIZE (rust/2018-03-29/rust-std-1.25.0-aarch64-unknown-freebsd.tar.gz) = 59733871 -SHA256 (rust/2018-03-29/cargo-0.26.0-aarch64-unknown-freebsd.tar.gz) = a2efee9c92a87ac48d3281eafeb24d713e32aca18dc7b287079f054dd68c533f -SIZE (rust/2018-03-29/cargo-0.26.0-aarch64-unknown-freebsd.tar.gz) = 4170950 -SHA256 (rust/2018-03-29/rustc-1.25.0-x86_64-unknown-freebsd.tar.gz) = 42279e4bb3ab6a6be87096c023ee62a43ffcefb36d2d23ed13b762c5b509ea6d -SIZE (rust/2018-03-29/rustc-1.25.0-x86_64-unknown-freebsd.tar.gz) = 56569917 -SHA256 (rust/2018-03-29/rust-std-1.25.0-x86_64-unknown-freebsd.tar.gz) = c5c62da893a1563e7ccff77ff313417a241300e09b4d06d9f5165bf35a72c58a -SIZE (rust/2018-03-29/rust-std-1.25.0-x86_64-unknown-freebsd.tar.gz) = 50228076 -SHA256 (rust/2018-03-29/cargo-0.26.0-x86_64-unknown-freebsd.tar.gz) = f5c4c0fbbb11b36223de815b734ab6f3497b6c453ca7f9fb93d457316fbfc1b7 -SIZE (rust/2018-03-29/cargo-0.26.0-x86_64-unknown-freebsd.tar.gz) = 5211772 -SHA256 (rust/2018-03-29/rustc-1.25.0-i686-unknown-freebsd.tar.gz) = 8a2488f0d905bd2d498addf8943bed58f817f3fad8387ba4cb7124f38a4c24dd -SIZE (rust/2018-03-29/rustc-1.25.0-i686-unknown-freebsd.tar.gz) = 56770706 -SHA256 (rust/2018-03-29/rust-std-1.25.0-i686-unknown-freebsd.tar.gz) = fe470bcb2e46d91d866b8a7cb22d7f78f421962b54116938b78286a4f9242775 -SIZE (rust/2018-03-29/rust-std-1.25.0-i686-unknown-freebsd.tar.gz) = 50402505 -SHA256 (rust/2018-03-29/cargo-0.26.0-i686-unknown-freebsd.tar.gz) = 3736e794fcede8f24dae8798d70ec4252b47516978460448e324b7dd3d875a73 -SIZE (rust/2018-03-29/cargo-0.26.0-i686-unknown-freebsd.tar.gz) = 4930623 +TIMESTAMP = 1531989867 +SHA256 (rust/rustc-1.27.1-src.tar.xz) = 948e2645057960ee1c03d9f0e8f78133a5f73d9ca9a24bc56126e395a212d25c +SIZE (rust/rustc-1.27.1-src.tar.xz) = 55458892 +SHA256 (rust/2018-05-10/rustc-1.26.0-aarch64-unknown-freebsd.tar.gz) = 74e87fe6b29fe56a353f045f8b0c1069c55e2fea8bd9e2d5da44606fdbcee362 +SIZE (rust/2018-05-10/rustc-1.26.0-aarch64-unknown-freebsd.tar.gz) = 62636938 +SHA256 (rust/2018-05-10/rust-std-1.26.0-aarch64-unknown-freebsd.tar.gz) = 73180f8ddde7e56622f596d9167beae0a1ab548bd5bf258cee276fdc87f30dca +SIZE (rust/2018-05-10/rust-std-1.26.0-aarch64-unknown-freebsd.tar.gz) = 62613320 +SHA256 (rust/2018-05-10/cargo-0.27.0-aarch64-unknown-freebsd.tar.gz) = 6cc48fd7a2d04ff151d7399c536d2e6a4cd37a7cd51ced67bb6978121b4bc3cb +SIZE (rust/2018-05-10/cargo-0.27.0-aarch64-unknown-freebsd.tar.gz) = 4349432 +SHA256 (rust/2018-05-10/rustc-1.26.0-x86_64-unknown-freebsd.tar.gz) = 9499ce5b68d631f8345c387e1f59b21892d97e0acb5650deb61a34719310bd38 +SIZE (rust/2018-05-10/rustc-1.26.0-x86_64-unknown-freebsd.tar.gz) = 64672199 +SHA256 (rust/2018-05-10/rust-std-1.26.0-x86_64-unknown-freebsd.tar.gz) = 38cd138eba2ccaff59513d154fec580b6663ca6ef38cd620c348364aa1e11a40 +SIZE (rust/2018-05-10/rust-std-1.26.0-x86_64-unknown-freebsd.tar.gz) = 64727651 +SHA256 (rust/2018-05-10/cargo-0.27.0-x86_64-unknown-freebsd.tar.gz) = ee0e709f26f14be1cf88a8fdff50063b78d33bb73d8e343aad7b2562a5730249 +SIZE (rust/2018-05-10/cargo-0.27.0-x86_64-unknown-freebsd.tar.gz) = 5905896 +SHA256 (rust/2018-05-10/rustc-1.26.0-i686-unknown-freebsd.tar.gz) = 11111cb60c00bc6e5ea27a0748068d3f2430809d2a3a7f8554750c24d1a728a9 +SIZE (rust/2018-05-10/rustc-1.26.0-i686-unknown-freebsd.tar.gz) = 65599090 +SHA256 (rust/2018-05-10/rust-std-1.26.0-i686-unknown-freebsd.tar.gz) = 549129f86701a8968b411b0c39e296312b2a3a0b3a8c221865d876b72f265972 +SIZE (rust/2018-05-10/rust-std-1.26.0-i686-unknown-freebsd.tar.gz) = 65229010 +SHA256 (rust/2018-05-10/cargo-0.27.0-i686-unknown-freebsd.tar.gz) = 438288ab5e28ffff96d2a4aeaaf656f7388cbc4b6706ad9e7423301089d615da +SIZE (rust/2018-05-10/cargo-0.27.0-i686-unknown-freebsd.tar.gz) = 5671969 Index: head/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs =================================================================== --- head/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs (revision 474977) +++ head/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs (nonexistent) @@ -1,11 +0,0 @@ ---- 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}; - - pub fn target() -> TargetResult { - let mut base = super::freebsd_base::opts(); -- base.cpu = "pentium4".to_string(); -+ base.cpu = "pentiumpro".to_string(); - base.max_atomic_width = Some(64); - base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); - base.stack_probes = true; Property changes on: head/lang/rust/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs =================================================================== --- head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (nonexistent) +++ head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 04:36:14 UTC ++++ src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs +@@ -1,3 +1,4 @@ ++pub type c_char = i8; + pub type clock_t = u64; + pub type ino_t = u64; + pub type lwpid_t = i32; Property changes on: head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_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_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs =================================================================== --- head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (nonexistent) +++ head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 04:36:14 UTC ++++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs +@@ -1,3 +1,4 @@ ++pub type c_char = u8; + pub type c_long = i64; + pub type c_ulong = u64; + pub type time_t = i64; Property changes on: head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.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_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs =================================================================== --- head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs (nonexistent) +++ head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 04:36:14 UTC ++++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs +@@ -1,3 +1,4 @@ ++pub type c_char = i8; + pub type c_long = i32; + pub type c_ulong = u32; + pub type time_t = i32; Property changes on: head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.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_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs =================================================================== --- head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (nonexistent) +++ head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 04:36:14 UTC ++++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs +@@ -1,3 +1,4 @@ ++pub type c_char = i8; + pub type c_long = i64; + pub type c_ulong = u64; + pub type time_t = i64; Property changes on: head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.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_liblibc_src_unix_bsd_freebsdlike_mod.rs =================================================================== --- head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs (nonexistent) +++ head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs (revision 474978) @@ -0,0 +1,18 @@ +--- src/liblibc/src/unix/bsd/freebsdlike/mod.rs.orig 2018-06-19 04:36:14 UTC ++++ src/liblibc/src/unix/bsd/freebsdlike/mod.rs +@@ -1,4 +1,3 @@ +-pub type c_char = i8; + pub type dev_t = u32; + pub type mode_t = u16; + pub type pthread_attr_t = *mut ::c_void; +@@ -84,7 +83,10 @@ s! { + + pub struct stack_t { + // In FreeBSD 11 and later, ss_sp is actually a void* ++ #[cfg(not(target_arch = "aarch64"))] + pub ss_sp: *mut ::c_char, ++ #[cfg(target_arch = "aarch64")] ++ pub ss_sp: *mut ::c_void, + pub ss_size: ::size_t, + pub ss_flags: ::c_int, + } Property changes on: head/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_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_librustc__target_spec_i686__unknown__freebsd.rs =================================================================== --- head/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs (nonexistent) +++ head/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs (revision 474978) @@ -0,0 +1,11 @@ +--- 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(); +- base.cpu = "pentium4".to_string(); ++ base.cpu = "pentiumpro".to_string(); + base.max_atomic_width = Some(64); + base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); + base.stack_probes = true; Property changes on: head/lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.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_libstd_os_raw_mod.rs =================================================================== --- head/lang/rust/files/patch-src_libstd_os_raw_mod.rs (nonexistent) +++ head/lang/rust/files/patch-src_libstd_os_raw_mod.rs (revision 474978) @@ -0,0 +1,18 @@ +--- src/libstd/os/raw/mod.rs.orig 2018-06-19 04:35:53 UTC ++++ src/libstd/os/raw/mod.rs +@@ -29,6 +29,7 @@ use fmt; + all(target_os = "android", any(target_arch = "aarch64", + target_arch = "arm")), + all(target_os = "l4re", target_arch = "x86_64"), ++ all(target_os = "freebsd", target_arch = "aarch64"), + all(target_os = "openbsd", target_arch = "aarch64"), + all(target_os = "fuchsia", target_arch = "aarch64")))] + #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; +@@ -41,6 +42,7 @@ use fmt; + all(target_os = "android", any(target_arch = "aarch64", + target_arch = "arm")), + all(target_os = "l4re", target_arch = "x86_64"), ++ all(target_os = "freebsd", target_arch = "aarch64"), + all(target_os = "openbsd", target_arch = "aarch64"), + all(target_os = "fuchsia", target_arch = "aarch64"))))] + #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; Property changes on: head/lang/rust/files/patch-src_libstd_os_raw_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_libstd_sys_unix_stack__overflow.rs =================================================================== --- head/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs (nonexistent) +++ head/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.rs (revision 474978) @@ -0,0 +1,31 @@ +--- src/libstd/sys/unix/stack_overflow.rs.orig 2018-06-19 04:35:53 UTC ++++ src/libstd/sys/unix/stack_overflow.rs +@@ -148,18 +148,20 @@ mod imp { + stackp + } + +- #[cfg(any(target_os = "linux", +- target_os = "macos", +- target_os = "bitrig", +- target_os = "netbsd", +- target_os = "openbsd", +- target_os = "solaris"))] ++ #[cfg(any(any(target_os = "linux", ++ target_os = "macos", ++ target_os = "bitrig", ++ target_os = "netbsd", ++ target_os = "openbsd", ++ target_os = "solaris"), ++ all(target_os = "freebsd", target_arch = "aarch64")))] + unsafe fn get_stack() -> libc::stack_t { + libc::stack_t { ss_sp: get_stackp(), ss_flags: 0, ss_size: SIGSTKSZ } + } + +- #[cfg(any(target_os = "freebsd", +- target_os = "dragonfly"))] ++ #[cfg(all(any(target_os = "freebsd", ++ target_os = "dragonfly"), ++ not(target_arch = "aarch64")))] + unsafe fn get_stack() -> libc::stack_t { + libc::stack_t { ss_sp: get_stackp() as *mut i8, ss_flags: 0, ss_size: SIGSTKSZ } + } Property changes on: head/lang/rust/files/patch-src_libstd_sys_unix_stack__overflow.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_llvm_utils_llvm-build_llvmbuild_main.py =================================================================== --- head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py (revision 474977) +++ head/lang/rust/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py (revision 474978) @@ -1,11 +1,11 @@ ---- 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', + 'i386' : 'X86', + 'amd64' : 'X86', 'x86_64' : 'X86', 'Unknown' : None }.get(opts.native_target, opts.native_target) Index: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (nonexistent) +++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 05:52:22 UTC ++++ src/vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs +@@ -1,3 +1,4 @@ ++pub type c_char = i8; + pub type clock_t = u64; + pub type ino_t = u64; + pub type lwpid_t = i32; Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_dragonfly_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_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (nonexistent) +++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 05:52:22 UTC ++++ src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs +@@ -1,3 +1,4 @@ ++pub type c_char = u8; + pub type c_long = i64; + pub type c_ulong = u64; + pub type time_t = i64; Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_aarch64.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_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs (nonexistent) +++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 05:52:22 UTC ++++ src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86.rs +@@ -1,3 +1,4 @@ ++pub type c_char = i8; + pub type c_long = i32; + pub type c_ulong = u32; + pub type time_t = i32; Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86.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_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (nonexistent) +++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs (revision 474978) @@ -0,0 +1,7 @@ +--- src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 05:52:22 UTC ++++ src/vendor/libc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs +@@ -1,3 +1,4 @@ ++pub type c_char = i8; + pub type c_long = i64; + pub type c_ulong = u64; + pub type time_t = i64; Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_freebsd_x86__64.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_vendor_libc_src_unix_bsd_freebsdlike_mod.rs =================================================================== --- head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs (nonexistent) +++ head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_mod.rs (revision 474978) @@ -0,0 +1,18 @@ +--- src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs.orig 2018-06-19 05:52:22 UTC ++++ src/vendor/libc/src/unix/bsd/freebsdlike/mod.rs +@@ -1,4 +1,3 @@ +-pub type c_char = i8; + pub type dev_t = u32; + pub type mode_t = u16; + pub type pthread_attr_t = *mut ::c_void; +@@ -84,7 +83,10 @@ s! { + + pub struct stack_t { + // In FreeBSD 11 and later, ss_sp is actually a void* ++ #[cfg(not(target_arch = "aarch64"))] + pub ss_sp: *mut ::c_char, ++ #[cfg(target_arch = "aarch64")] ++ pub ss_sp: *mut ::c_void, + pub ss_size: ::size_t, + pub ss_flags: ::c_int, + } Property changes on: head/lang/rust/files/patch-src_vendor_libc_src_unix_bsd_freebsdlike_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