Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 534268) +++ head/lang/rust/Makefile (revision 534269) @@ -1,228 +1,228 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.43.0 +PORTVERSION?= 1.43.1 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ LOCAL/tobik/rust:bootstrap \ https://static.rust-lang.org/dist/:bootstrap DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src DISTFILES?= ${NIGHTLY_DATE:D${NIGHTLY_DATE}/}${DISTNAME}${EXTRACT_SUFX}:src \ ${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ ${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap \ ${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}${EXTRACT_SUFX}:bootstrap DIST_SUBDIR?= rust MAINTAINER= rust@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency LICENSE= APACHE20 MIT LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT IGNORE_FreeBSD_11_powerpc64= is missing a bootstrap for FreeBSD 11.x powerpc64 ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap compiler BUILD_DEPENDS= cmake:devel/cmake \ libgit2>=1.0.0:devel/libgit2 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 USES= pkgconfig python:3.3+,build ssl tar:xz MAKE_ENV= LIBGIT2_SYS_USE_PKG_CONFIG=1 \ LIBSSH2_SYS_USE_PKG_CONFIG=1 \ OPENSSL_DIR="${OPENSSLBASE}" \ RUST_BACKTRACE=1 TEST_ENV= ${MAKE_ENV} \ ALLOW_NONZERO_RLIMIT_CORE=1 CONFLICTS_INSTALL?= rust-nightly OPTIONS_DEFINE= DOCS GDB SOURCES WASM OPTIONS_DEFAULT= SOURCES WASM GDB_DESC= Install ports gdb (necessary for debugging rust programs) SOURCES_DESC= Install source files WASM_DESC= Build the WebAssembly target (wasm32-unknown-unknown) DOCS_VARS= _RUST_BUILD_DOCS=true DOCS_VARS_OFF= _RUST_BUILD_DOCS=false GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb WASM_VARS= _RUST_BUILD_WASM=true \ _RUST_TARGETS+=wasm32-unknown-unknown WASM_VARS_OFF= _RUST_BUILD_WASM=false # See WRKSRC/src/stage0.txt for the date and version values. BOOTSTRAPS_DATE?= 2020-03-12 RUST_BOOTSTRAP_VERSION?= 1.42.0 CARGO_BOOTSTRAP_VERSION?= 0.43.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} CARGO_VENDOR_DIR?= ${WRKSRC}/vendor # Rust's target arch string might be different from *BSD arch strings _RUST_ARCH_amd64= x86_64 _RUST_ARCH_i386= i686 _RUST_TARGET= ${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl} _RUST_TARGETS= ${_RUST_TARGET} _RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${_RUST_TARGET} .include .if exists(${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX}) EXTRA_PATCHES+= ${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX} .endif .if ${ARCH} == powerpc64 # The bootstrap is hardcoded to use gcc9 # but we can build with a newer or older compiler as provided by USE_GCC=yes BUILD_DEPENDS+= gcc9:lang/gcc9 USE_GCC= yes .endif .if ${ARCH} == aarch64 && ${OSVERSION} < 1200502 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 post-patch: @${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb .if defined(NIGHTLY_DATE) @${REINPLACE_CMD} '/^rustfmt:/d' ${WRKSRC}/src/stage0.txt .endif .if ${ARCH} == powerpc64 # Starting with 13.0 powerpc64 is ELFv2 while 12.0 is ELFv1. Pass the correct LLVM target triple. @${REINPLACE_CMD} 's,powerpc64-unknown-freebsd,powerpc64-unknown-freebsd${OSREL},' \ ${WRKSRC}/src/librustc_target/spec/powerpc64_unknown_freebsd.rs .endif # Disable vendor checksums @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${CARGO_VENDOR_DIR}/*/.cargo-checksum.json post-patch-SOURCES-off: # Mimic tools in config.toml with just src excluded @${REINPLACE_CMD} 's,config.tools.*"src".*,false;,' \ ${WRKSRC}/src/bootstrap/install.rs do-configure: # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64 @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh .for _component in cargo rust-std rustc @cd ${WRKDIR}/${_component}-*-${OPSYS:tl} && \ ${SH} install.sh --disable-ldconfig --prefix=${WRKDIR}/bootstrap \ --verbose .endfor @${ECHO_CMD} '[build]' > ${WRKSRC}/config.toml @${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'extended=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'docs=${_RUST_BUILD_DOCS}' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'target=[${_RUST_TARGETS:@.target.@"${.target.}"@:ts,}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cargo="${WRKDIR}/bootstrap/bin/cargo"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'rustc="${WRKDIR}/bootstrap/bin/rustc"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'lld=${_RUST_BUILD_WASM}' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) @${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif .if ${ARCH} == armv6 # fails to link with base ld.bfd: rustc_codegen_llvm.e2557spx-cgu.11:(.text._ZN89_$LT$rustc_target..abi..call..CastTarget$u20$as$u20$rustc_codegen_llvm..abi..LlvmType$GT$9llvm_type17h1296210ab461fc57E+0x54): relocation truncated to fit: R_ARM_CALL against symbol `__aeabi_uldivmod' defined in .text.__aeabi_uldivmod section in /tmp/rustcdnGbao/libcompiler_builtins-ee65b414e4115a8f.rlib(compiler_builtins-ee65b414e4115a8f.compiler_builtins.ay8p39ey-cgu.13.rcgu.o) @${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=lld "$$@"' > ${WRKDIR}/cc-wrapper @${CHMOD} +x ${WRKDIR}/cc-wrapper .endif .for _target in ${_RUST_TARGETS} @${ECHO_CMD} '[target.${_target}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'ar="${AR}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml .if ${ARCH} == armv6 @${ECHO_CMD} 'linker="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml .endif .endfor @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml @${REINPLACE_CMD} 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs do-build: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --jobs=${MAKE_JOBS_NUMBER} do-install: # DESTDIR not in MAKE_ENV as it would cause the bundled LLVM to be # staged into it during do-build. @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${PYTHON_CMD} \ x.py install --jobs=${MAKE_JOBS_NUMBER} # We autogenerate the plist file. 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 cannot know their filename in advance. @${RM} -r ${STAGEDIR}${DOCSDIR}/*.old \ ${STAGEDIR}${DOCSDIR}/html/.lock \ ${STAGEDIR}${DOCSDIR}/html/.stamp \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh @${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -exec ${FILE} -i {} + | \ ${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} @${FIND} ${STAGEDIR}${PREFIX} -not -type d | \ ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,' \ -e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' >> ${TMPPLIST} post-install-SOURCES-on: # Silence stage-qa warnings by sanitizing permissions on sources @${FIND} ${STAGEDIR}${PREFIX}/lib/rustlib/src -type f -exec ${CHMOD} \ ${SHAREMODE} {} + # Note that make test does not work when rust is already installed. do-test: @cd ${WRKSRC} && \ ${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --jobs=${MAKE_JOBS_NUMBER} .if !defined(_RUST_MAKESUM_GUARD) makesum: ${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]} ${MAKE} -D_RUST_MAKESUM_GUARD makesum PPC_ABI=ELFv1 ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch} ${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp ${RM} ${DISTINFO_FILE}.${arch} .endfor .if ${ONLY_FOR_ARCHS:Mpowerpc64} ${MAKE} -D_RUST_MAKESUM_GUARD makesum PPC_ABI=ELFv2 ARCH=powerpc64 DISTINFO_FILE=${DISTINFO_FILE}.powerpc64-elfv2 ${SED} 1d ${DISTINFO_FILE}.powerpc64-elfv2 >> ${DISTINFO_FILE}.tmp ${RM} ${DISTINFO_FILE}.powerpc64-elfv2 .endif ${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE} ${RM} ${DISTINFO_FILE}.tmp .endif .include Index: head/lang/rust/distinfo =================================================================== --- head/lang/rust/distinfo (revision 534268) +++ head/lang/rust/distinfo (revision 534269) @@ -1,45 +1,45 @@ -TIMESTAMP = 1587600298 -SHA256 (rust/rustc-1.43.0-src.tar.xz) = d0899933840369f07394b211cb0b53a5cd4634907633f0bee541133c8b75e309 -SIZE (rust/rustc-1.43.0-src.tar.xz) = 94354332 +TIMESTAMP = 1588774409 +SHA256 (rust/rustc-1.43.1-src.tar.xz) = eb0a103c67c4565403d9e6f84a1c708982a5e9e5b3c0d831e4d6f6451795d106 +SIZE (rust/rustc-1.43.1-src.tar.xz) = 94405276 SHA256 (rust/2020-03-12/rustc-1.42.0-aarch64-unknown-freebsd.tar.xz) = a8f1f858837b160bd63ce2526ab6add67ed6fcda56b6e5d566434b11f0e5f56f SIZE (rust/2020-03-12/rustc-1.42.0-aarch64-unknown-freebsd.tar.xz) = 26088116 SHA256 (rust/2020-03-12/rust-std-1.42.0-aarch64-unknown-freebsd.tar.xz) = 5d24030cf4476850c2873caa1f00580b4c9e21d71aace2318c0b3ba496e7b6a7 SIZE (rust/2020-03-12/rust-std-1.42.0-aarch64-unknown-freebsd.tar.xz) = 13088580 SHA256 (rust/2020-03-12/cargo-0.43.0-aarch64-unknown-freebsd.tar.xz) = e91c969f3a14a84008bb8318ba133b4f9b0d8db592ea8e8f82ca71c693e3e8b6 SIZE (rust/2020-03-12/cargo-0.43.0-aarch64-unknown-freebsd.tar.xz) = 3778792 SHA256 (rust/2020-03-12/rustc-1.42.0-x86_64-unknown-freebsd.tar.xz) = 57bf3f88f1ef09142c45a434a79611bb81e5366862a9f954d5ff76a5c09ef3db SIZE (rust/2020-03-12/rustc-1.42.0-x86_64-unknown-freebsd.tar.xz) = 28223964 SHA256 (rust/2020-03-12/rust-std-1.42.0-x86_64-unknown-freebsd.tar.xz) = c132f7024d83c717e518ff01830ec37a779db4b6f4b57d03633b8663bb7672f9 SIZE (rust/2020-03-12/rust-std-1.42.0-x86_64-unknown-freebsd.tar.xz) = 13665440 SHA256 (rust/2020-03-12/cargo-0.43.0-x86_64-unknown-freebsd.tar.xz) = b7d01dfc78082a3081a30acba89eeeaddb01f8e2d5dc9959f415079d53c92d18 SIZE (rust/2020-03-12/cargo-0.43.0-x86_64-unknown-freebsd.tar.xz) = 4411904 SHA256 (rust/2020-03-12/rustc-1.42.0-armv6-unknown-freebsd.tar.xz) = 1de050ad62ec3777ebfb35fb4fdcb28b4774549b5cbad6291e4b4d7787fe8c4e SIZE (rust/2020-03-12/rustc-1.42.0-armv6-unknown-freebsd.tar.xz) = 27219532 SHA256 (rust/2020-03-12/rust-std-1.42.0-armv6-unknown-freebsd.tar.xz) = eb3265f010b7ea874a7875df99d7ca699001fccc205011bef9fef6b07c44a5eb SIZE (rust/2020-03-12/rust-std-1.42.0-armv6-unknown-freebsd.tar.xz) = 13120800 SHA256 (rust/2020-03-12/cargo-0.43.0-armv6-unknown-freebsd.tar.xz) = 09afe625801c252d7bf84b60248776269ede2e886937f4bc3e1210e37c3bf8e2 SIZE (rust/2020-03-12/cargo-0.43.0-armv6-unknown-freebsd.tar.xz) = 3850860 SHA256 (rust/2020-03-12/rustc-1.42.0-armv7-unknown-freebsd.tar.xz) = 6ae842cb01ac1b8e26b90c21ae3e4cc5feb53490603c6513b14fd2e8348b5c34 SIZE (rust/2020-03-12/rustc-1.42.0-armv7-unknown-freebsd.tar.xz) = 27377064 SHA256 (rust/2020-03-12/rust-std-1.42.0-armv7-unknown-freebsd.tar.xz) = f24cc8db0d44d127c933c9d0c3828183b3b8701ac60f691bc81bd8bb6debc150 SIZE (rust/2020-03-12/rust-std-1.42.0-armv7-unknown-freebsd.tar.xz) = 13074792 SHA256 (rust/2020-03-12/cargo-0.43.0-armv7-unknown-freebsd.tar.xz) = 619572f3c0786e275ce9120a3fcc8b629a6deaedc36d79134c328cc9dc4d0293 SIZE (rust/2020-03-12/cargo-0.43.0-armv7-unknown-freebsd.tar.xz) = 3847128 SHA256 (rust/2020-03-12/rustc-1.42.0-i686-unknown-freebsd.tar.xz) = 48a22fce0ce707c36abc06a802f09055cf3159f038dfeb7c85b0c64783311c44 SIZE (rust/2020-03-12/rustc-1.42.0-i686-unknown-freebsd.tar.xz) = 28924904 SHA256 (rust/2020-03-12/rust-std-1.42.0-i686-unknown-freebsd.tar.xz) = ea808b5867263f5e5c49303d3e404df3684bb78105ffbe80c91db770f0cd8bee SIZE (rust/2020-03-12/rust-std-1.42.0-i686-unknown-freebsd.tar.xz) = 13596844 SHA256 (rust/2020-03-12/cargo-0.43.0-i686-unknown-freebsd.tar.xz) = b876b882513a4b6848e31788aa8181bfbece9b3e75b1ca807edb8300e539267d SIZE (rust/2020-03-12/cargo-0.43.0-i686-unknown-freebsd.tar.xz) = 4467712 SHA256 (rust/2020-03-12/rustc-1.42.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = bb5a93a7b72673dd36c1b36d4826118b8d5e6f4914777b10406dde9a890e5a09 SIZE (rust/2020-03-12/rustc-1.42.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 32013656 SHA256 (rust/2020-03-12/rust-std-1.42.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b70b28c1630917ec0475891aef1f8ad24ae2ee7a2f3acbc0050648e4efde4b5d SIZE (rust/2020-03-12/rust-std-1.42.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 13056600 SHA256 (rust/2020-03-12/cargo-0.43.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b4c4e1d998ae003d878ec79ebeb9762655fd8d1eb7ec0d06eea9eebf53732ba2 SIZE (rust/2020-03-12/cargo-0.43.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4303300 SHA256 (rust/2020-03-12/rustc-1.42.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = f6fa812e3cdffffd7c9010a23fc7a33a042b490bc7763c8ef35c87a5952e5400 SIZE (rust/2020-03-12/rustc-1.42.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 26564788 SHA256 (rust/2020-03-12/rust-std-1.42.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 41639879c77b37feb60a85c5f935374c3d2eb95604175bc59ea3ea5a6cdafc40 SIZE (rust/2020-03-12/rust-std-1.42.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 13032100 SHA256 (rust/2020-03-12/cargo-0.43.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = c853af3a88baabf87bde3453f511b3c4586eb819fa7caed18b51b70d370efbf9 SIZE (rust/2020-03-12/cargo-0.43.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4025108 Index: head/lang/rust/files/patch-vendor_openssl-src_src_lib.rs =================================================================== --- head/lang/rust/files/patch-vendor_openssl-src_src_lib.rs (revision 534268) +++ head/lang/rust/files/patch-vendor_openssl-src_src_lib.rs (nonexistent) @@ -1,29 +0,0 @@ -https://github.com/alexcrichton/openssl-src-rs/commit/5e2626a7299dde1adb25073445b72dddd93e261e - ---- vendor/openssl-src/src/lib.rs.orig 2020-01-08 04:20:57 UTC -+++ vendor/openssl-src/src/lib.rs -@@ -135,6 +135,7 @@ impl Build { - // that bypasses basically everything `cc` does, so let's just cop - // out and say it's linux and hope it works. - "aarch64-linux-android" => "linux-aarch64", -+ "aarch64-unknown-freebsd" => "BSD-generic64", - "aarch64-unknown-linux-gnu" => "linux-aarch64", - "aarch64-unknown-linux-musl" => "linux-aarch64", - "aarch64-pc-windows-msvc" => "VC-WIN64-ARM", -@@ -144,6 +145,8 @@ impl Build { - "arm-unknown-linux-gnueabihf" => "linux-armv4", - "arm-unknown-linux-musleabi" => "linux-armv4", - "arm-unknown-linux-musleabihf" => "linux-armv4", -+ "armv6-unknown-freebsd" => "BSD-generic32", -+ "armv7-unknown-freebsd" => "BSD-generic32", - "armv7-unknown-linux-gnueabihf" => "linux-armv4", - "armv7-unknown-linux-musleabihf" => "linux-armv4", - "asmjs-unknown-emscripten" => "gcc", -@@ -159,6 +162,7 @@ impl Build { - "mips64el-unknown-linux-gnuabi64" => "linux64-mips64", - "mipsel-unknown-linux-gnu" => "linux-mips32", - "powerpc-unknown-linux-gnu" => "linux-ppc", -+ "powerpc64-unknown-freebsd" => "BSD-generic64", - "powerpc64-unknown-linux-gnu" => "linux-ppc64", - "powerpc64le-unknown-linux-gnu" => "linux-ppc64le", - "s390x-unknown-linux-gnu" => "linux64-s390x", Property changes on: head/lang/rust/files/patch-vendor_openssl-src_src_lib.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_stdarch_crates_std__detect_src_detect_mod.rs =================================================================== --- head/lang/rust/files/patch-src_stdarch_crates_std__detect_src_detect_mod.rs (revision 534268) +++ head/lang/rust/files/patch-src_stdarch_crates_std__detect_src_detect_mod.rs (nonexistent) @@ -1,11 +0,0 @@ ---- src/stdarch/crates/std_detect/src/detect/mod.rs.orig 2020-04-21 17:12:47 UTC -+++ src/stdarch/crates/std_detect/src/detect/mod.rs -@@ -100,7 +100,7 @@ cfg_if! { - } else if #[cfg(all(target_os = "linux", feature = "use_std"))] { - #[path = "os/linux/mod.rs"] - mod os; -- } else if #[cfg(target_os = "freebsd")] { -+ } else if #[cfg(all(target_os = "freebsd", feature = "use_std"))] { - #[cfg(target_arch = "aarch64")] - #[path = "os/aarch64.rs"] - mod aarch64; Property changes on: head/lang/rust/files/patch-src_stdarch_crates_std__detect_src_detect_mod.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/powerpc64-elfv1/patch-src_librustc__mir_dataflow_generic_engine.rs =================================================================== --- head/lang/rust/files/powerpc64-elfv1/patch-src_librustc__mir_dataflow_generic_engine.rs (nonexistent) +++ head/lang/rust/files/powerpc64-elfv1/patch-src_librustc__mir_dataflow_generic_engine.rs (revision 534269) @@ -0,0 +1,81 @@ +Revert https://github.com/rust-lang/rust/commit/e82ec2315e5adb1c291c3702cd2ac1f46ecd0fcf +it causes sigsegv on powerpc64 + +--- src/librustc_mir/dataflow/generic/engine.rs.orig 2020-04-21 00:17:56 UTC ++++ src/librustc_mir/dataflow/generic/engine.rs +@@ -239,27 +239,24 @@ where + } + + SwitchInt { ref targets, ref values, ref discr, .. } => { +- let Engine { tcx, body, .. } = *self; +- let enum_ = discr +- .place() +- .and_then(|discr| switch_on_enum_discriminant(tcx, body, bb_data, discr)); +- match enum_ { +- // If this is a switch on an enum discriminant, a custom effect may be applied +- // along each outgoing edge. +- Some((enum_place, enum_def)) => { ++ // If this is a switch on an enum discriminant, a custom effect may be applied ++ // along each outgoing edge. ++ if let Some(place) = discr.place() { ++ let enum_def = switch_on_enum_discriminant(self.tcx, self.body, bb_data, place); ++ if let Some(enum_def) = enum_def { + self.propagate_bits_into_enum_discriminant_switch_successors( +- in_out, bb, enum_def, enum_place, dirty_list, &*values, &*targets, ++ in_out, bb, enum_def, place, dirty_list, &*values, &*targets, + ); +- } + +- // Otherwise, it's just a normal `SwitchInt`, and every successor sees the same +- // exit state. +- None => { +- for target in targets.iter().copied() { +- self.propagate_bits_into_entry_set_for(&in_out, target, dirty_list); +- } ++ return; + } + } ++ ++ // Otherwise, it's just a normal `SwitchInt`, and every successor sees the same ++ // exit state. ++ for target in targets.iter().copied() { ++ self.propagate_bits_into_entry_set_for(&in_out, target, dirty_list); ++ } + } + + Call { cleanup, ref destination, ref func, ref args, .. } => { +@@ -345,27 +342,22 @@ where + } + } + +-/// Inspect a `SwitchInt`-terminated basic block to see if the condition of that `SwitchInt` is +-/// an enum discriminant. +-/// +-/// We expect such blocks to have a call to `discriminant` as their last statement like so: +-/// _42 = discriminant(_1) ++/// Look at the last statement of a block that ends with to see if it is an assignment of an enum ++/// discriminant to the local that determines the target of a `SwitchInt` like so: ++/// _42 = discriminant(..) + /// SwitchInt(_42, ..) +-/// +-/// If the basic block matches this pattern, this function returns the place corresponding to the +-/// enum (`_1` in the example above) as well as the `AdtDef` of that enum. + fn switch_on_enum_discriminant( + tcx: TyCtxt<'tcx>, +- body: &'mir mir::Body<'tcx>, +- block: &'mir mir::BasicBlockData<'tcx>, ++ body: &mir::Body<'tcx>, ++ block: &mir::BasicBlockData<'tcx>, + switch_on: &mir::Place<'tcx>, +-) -> Option<(&'mir mir::Place<'tcx>, &'tcx ty::AdtDef)> { ++) -> Option<&'tcx ty::AdtDef> { + match block.statements.last().map(|stmt| &stmt.kind) { + Some(mir::StatementKind::Assign(box (lhs, mir::Rvalue::Discriminant(discriminated)))) + if lhs == switch_on => + { + match &discriminated.ty(body, tcx).ty.kind { +- ty::Adt(def, _) => Some((discriminated, def)), ++ ty::Adt(def, _) => Some(def), + + // `Rvalue::Discriminant` is also used to get the active yield point for a + // generator, but we do not need edge-specific effects in that case. This may Property changes on: head/lang/rust/files/powerpc64-elfv1/patch-src_librustc__mir_dataflow_generic_engine.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/powerpc64-elfv2/patch-src_librustc__mir_dataflow_generic_engine.rs =================================================================== --- head/lang/rust/files/powerpc64-elfv2/patch-src_librustc__mir_dataflow_generic_engine.rs (nonexistent) +++ head/lang/rust/files/powerpc64-elfv2/patch-src_librustc__mir_dataflow_generic_engine.rs (revision 534269) @@ -0,0 +1,81 @@ +Revert https://github.com/rust-lang/rust/commit/e82ec2315e5adb1c291c3702cd2ac1f46ecd0fcf +it causes sigsegv on powerpc64 + +--- src/librustc_mir/dataflow/generic/engine.rs.orig 2020-04-21 00:17:56 UTC ++++ src/librustc_mir/dataflow/generic/engine.rs +@@ -239,27 +239,24 @@ where + } + + SwitchInt { ref targets, ref values, ref discr, .. } => { +- let Engine { tcx, body, .. } = *self; +- let enum_ = discr +- .place() +- .and_then(|discr| switch_on_enum_discriminant(tcx, body, bb_data, discr)); +- match enum_ { +- // If this is a switch on an enum discriminant, a custom effect may be applied +- // along each outgoing edge. +- Some((enum_place, enum_def)) => { ++ // If this is a switch on an enum discriminant, a custom effect may be applied ++ // along each outgoing edge. ++ if let Some(place) = discr.place() { ++ let enum_def = switch_on_enum_discriminant(self.tcx, self.body, bb_data, place); ++ if let Some(enum_def) = enum_def { + self.propagate_bits_into_enum_discriminant_switch_successors( +- in_out, bb, enum_def, enum_place, dirty_list, &*values, &*targets, ++ in_out, bb, enum_def, place, dirty_list, &*values, &*targets, + ); +- } + +- // Otherwise, it's just a normal `SwitchInt`, and every successor sees the same +- // exit state. +- None => { +- for target in targets.iter().copied() { +- self.propagate_bits_into_entry_set_for(&in_out, target, dirty_list); +- } ++ return; + } + } ++ ++ // Otherwise, it's just a normal `SwitchInt`, and every successor sees the same ++ // exit state. ++ for target in targets.iter().copied() { ++ self.propagate_bits_into_entry_set_for(&in_out, target, dirty_list); ++ } + } + + Call { cleanup, ref destination, ref func, ref args, .. } => { +@@ -345,27 +342,22 @@ where + } + } + +-/// Inspect a `SwitchInt`-terminated basic block to see if the condition of that `SwitchInt` is +-/// an enum discriminant. +-/// +-/// We expect such blocks to have a call to `discriminant` as their last statement like so: +-/// _42 = discriminant(_1) ++/// Look at the last statement of a block that ends with to see if it is an assignment of an enum ++/// discriminant to the local that determines the target of a `SwitchInt` like so: ++/// _42 = discriminant(..) + /// SwitchInt(_42, ..) +-/// +-/// If the basic block matches this pattern, this function returns the place corresponding to the +-/// enum (`_1` in the example above) as well as the `AdtDef` of that enum. + fn switch_on_enum_discriminant( + tcx: TyCtxt<'tcx>, +- body: &'mir mir::Body<'tcx>, +- block: &'mir mir::BasicBlockData<'tcx>, ++ body: &mir::Body<'tcx>, ++ block: &mir::BasicBlockData<'tcx>, + switch_on: &mir::Place<'tcx>, +-) -> Option<(&'mir mir::Place<'tcx>, &'tcx ty::AdtDef)> { ++) -> Option<&'tcx ty::AdtDef> { + match block.statements.last().map(|stmt| &stmt.kind) { + Some(mir::StatementKind::Assign(box (lhs, mir::Rvalue::Discriminant(discriminated)))) + if lhs == switch_on => + { + match &discriminated.ty(body, tcx).ty.kind { +- ty::Adt(def, _) => Some((discriminated, def)), ++ ty::Adt(def, _) => Some(def), + + // `Rvalue::Discriminant` is also used to get the active yield point for a + // generator, but we do not need edge-specific effects in that case. This may Property changes on: head/lang/rust/files/powerpc64-elfv2/patch-src_librustc__mir_dataflow_generic_engine.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-bootstrap/Makefile =================================================================== --- head/lang/rust-bootstrap/Makefile (revision 534268) +++ head/lang/rust-bootstrap/Makefile (revision 534269) @@ -1,231 +1,231 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION= 1.43.0 +PORTVERSION= 1.43.1 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:rust \ LOCAL/tobik:armbase \ LOCAL/tobik:base \ https://download.freebsd.org/ftp/${_RUST_FBSD_SUBDIR_${FLAVOR}}/:base \ LOCAL/tobik:powerpc64_gcc # http://pkg.freebsd.org/FreeBSD:12:powerpc64/quarterly/All/gcc9-9.2.0.txz?dummy=/:powerpc64_gcc PKGNAMESUFFIX= -bootstrap DISTNAME= ${PORTNAME}c-${PORTVERSION}-src DISTFILES= rust/${DISTNAME}${EXTRACT_SUFX}:rust \ ${_RUST_FBSD_DIST_${FLAVOR}} MAINTAINER= rust@FreeBSD.org COMMENT= Create bootstrap compilers for building lang/rust LICENSE= APACHE20 MIT LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= untested on other archs BUILD_DEPENDS= cmake:devel/cmake \ gmake:devel/gmake \ rust>=${PORTVERSION}:lang/rust FLAVORS= aarch64 amd64 armv6 armv7 i386 powerpc64_elfv1 powerpc64_elfv2 FLAVOR?= ${FLAVORS:[1]} aarch64_PKGNAMEPREFIX= aarch64- amd64_PKGNAMEPREFIX= amd64- armv6_PKGNAMEPREFIX= armv6- armv7_PKGNAMEPREFIX= armv7- i386_PKGNAMEPREFIX= i386- powerpc64_elfv1_PKGNAMEPREFIX= powerpc64-elfv1- powerpc64_elfv1_BUILD_DEPENDS= powerpc64-gcc9>0:devel/freebsd-gcc9@powerpc64 powerpc64_elfv2_PKGNAMEPREFIX= powerpc64-elfv2- USES= perl5 python:3.3+,build tar:xz .if ${FLAVOR} == powerpc64_elfv1 USE_GCC= yes .endif # for openssl-src crate USE_PERL5= build PATCHDIR= ${.CURDIR}/../rust/files # Resulting packages are not specific to amd64 NO_ARCH= yes _RUST_FBSD_DIST_aarch64= FreeBSD-${_RUST_FBSD_VER}-arm64${EXTRACT_SUFX}:base _RUST_FBSD_DIST_amd64= FreeBSD-${_RUST_FBSD_VER}-amd64${EXTRACT_SUFX}:base # base.txz for armv* created from WANDBOARD images as there seem # to be no generic base.txz for it. _RUST_FBSD_DIST_armv6= FreeBSD-${_RUST_FBSD_VER}-arm-armv6${EXTRACT_SUFX}:armbase _RUST_FBSD_DIST_armv7= FreeBSD-${_RUST_FBSD_VER}-arm-armv7${EXTRACT_SUFX}:armbase _RUST_FBSD_DIST_i386= FreeBSD-${_RUST_FBSD_VER}-i386${EXTRACT_SUFX}:base _RUST_FBSD_DIST_powerpc64_elfv1= FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv1${EXTRACT_SUFX}:base \ FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv1-gcc9-9.2.0${EXTRACT_SUFX}:powerpc64_gcc _RUST_FBSD_DIST_powerpc64_elfv2= FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv2-r356261${EXTRACT_SUFX}:base _RUST_FBSD_VER= ${_RUST_FBSD_VER_${FLAVOR}:U11.3-RELEASE} _RUST_FBSD_VER_armv7= 12.1-RELEASE _RUST_FBSD_VER_powerpc64_elfv1= 12.1-RELEASE _RUST_FBSD_VER_powerpc64_elfv2= 13.0-CURRENT _RUST_FBSD_SUBDIR_aarch64= releases/arm64/${_RUST_FBSD_VER}/base.txz?dummy= _RUST_FBSD_SUBDIR_amd64= releases/amd64/${_RUST_FBSD_VER}/base.txz?dummy= _RUST_FBSD_SUBDIR_i386= releases/i386/${_RUST_FBSD_VER}/base.txz?dummy= _RUST_FBSD_SUBDIR_powerpc64_elfv1= releases/powerpc/powerpc64/${_RUST_FBSD_VER}/base.txz?dummy= _RUST_FBSD_SUBDIR_powerpc64_elfv2= snapshots/powerpc/powerpc64/${_RUST_FBSD_VER}/base.txz?dummy= _CARGO_VENDOR_DIR= ${WRKSRC}/vendor _RUST_ARCH_amd64= x86_64 _RUST_ARCH_i386= i686 _RUST_ARCH_powerpc64_elfv1= powerpc64 _RUST_ARCH_powerpc64_elfv2= powerpc64 _RUST_HOST= ${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl} _RUST_TARGET= ${_RUST_ARCH_${FLAVOR}:U${FLAVOR}}-unknown-${OPSYS:tl} _RUST_LLVM_TARGET= ${_RUST_LLVM_TARGET_${FLAVOR}} _RUST_LLVM_TARGET_aarch64= AArch64 _RUST_LLVM_TARGET_amd64= X86 _RUST_LLVM_TARGET_armv6= ARM _RUST_LLVM_TARGET_armv7= ARM _RUST_LLVM_TARGET_i386= X86 _RUST_LLVM_TARGET_powerpc64_elfv1= PowerPC _RUST_LLVM_TARGET_powerpc64_elfv2= PowerPC _RUST_LLVM_TRIPLE= ${_RUST_LLVM_TRIPLE_${FLAVOR}:U${_RUST_TARGET}} _RUST_LLVM_TRIPLE_armv6= armv6-gnueabihf-freebsd _RUST_LLVM_TRIPLE_armv7= armv7-gnueabihf-freebsd .include .if ${OPSYS} != FreeBSD IGNORE= is only for FreeBSD .elif ${OSVERSION} < 1200502 IGNORE= will not build on 12.0 due to old toolchain; 11.x untested .endif .if exists(${PATCHDIR}/${FLAVOR:S/_/-/}) EXTRA_PATCHES+= ${PATCHDIR}/${FLAVOR:S/_/-/} .endif post-patch: # Disable vendor checksums @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${_CARGO_VENDOR_DIR}/*/.cargo-checksum.json .if ${FLAVOR:Mpowerpc64_*} @${REINPLACE_CMD} -e 's,powerpc64-unknown-freebsd,${_RUST_TARGET}${_RUST_FBSD_VER:S/-/ /:[1]},' \ ${WRKSRC}/src/librustc_target/spec/powerpc64_unknown_freebsd.rs .endif .if ${FLAVOR} == powerpc64_elfv1 @${REINPLACE_CMD} -e 's,"c++","stdc++",g' \ ${WRKSRC}/src/librustc_llvm/build.rs .endif @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \ -e 's,%WRKDIR%,${WRKDIR},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs do-configure: # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64 @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh @${ECHO_CMD} '[build]' > ${WRKSRC}/config.toml @${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'extended=false' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'docs=false' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cargo-native-static=true' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cargo="${LOCALBASE}/bin/cargo"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'rustc="${LOCALBASE}/bin/rustc"' >> ${WRKSRC}/config.toml .if ${_RUST_HOST} != ${_RUST_TARGET} @${ECHO_CMD} 'host=["${_RUST_HOST}","${_RUST_TARGET}"]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'target=["${_RUST_TARGET}"]' >> ${WRKSRC}/config.toml .endif @${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'channel="stable"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'link-shared=false' >> ${WRKSRC}/config.toml .if ${FLAVOR} == powerpc64_elfv1 @${ECHO_CMD} 'static-libstdcpp=true' >> ${WRKSRC}/config.toml .endif .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) @${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml .else @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .endif # we need to make sure to always build llvm with X86 support to get a # host compiler that can build the host->target compiler @${ECHO_CMD} 'targets="${_RUST_LLVM_TARGET};X86"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cc="${WRKDIR}/${_RUST_TARGET}-cc"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${WRKDIR}/${_RUST_TARGET}-c++"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'linker="${WRKDIR}/${_RUST_TARGET}-cc"' >> ${WRKSRC}/config.toml .for _key _util in ar ${AR} ranlib ${RANLIB} @bin="$$(which ${_util})"; \ ${ECHO_CMD} "${_key}=\"$$bin\"" >> ${WRKSRC}/config.toml .endfor .if ${_RUST_HOST} != ${_RUST_TARGET} @${ECHO_CMD} '[target.${_RUST_HOST}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml .endif @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml .if ${FLAVOR} == powerpc64_elfv1 @${RLN} ${WRKDIR}${LOCALBASE}/lib/gcc9/libstdc++.a ${WRKDIR}/usr/lib/libstdc++.a @${RLN} ${WRKDIR}${LOCALBASE}/lib/gcc9/libstdc++.a ${WRKDIR}/usr/lib/libc++.a @gcc="$$(${ECHO_CMD} ${LOCALBASE}/bin/${_RUST_TARGET}*[0-9]-gcc9)"; \ ${PRINTF} '#!/bin/sh\nexec %s --sysroot=${WRKDIR} -Wl,-rpath=${LOCALBASE}/lib/gcc9 -L${WRKDIR}${LOCALBASE}/lib/gcc9 "$$@"\n' "$${gcc}" \ > ${WRKDIR}/${_RUST_TARGET}-cc @gcc="$$(${ECHO_CMD} ${LOCALBASE}/bin/${_RUST_TARGET}*[0-9]-g++9)"; \ cxxinc="/$$(cd ${WRKDIR} && ${ECHO_CMD} ${LOCALBASE:S,^/,,}/lib/gcc9/include/c++/powerpc64-*)"; \ ${PRINTF} '#!/bin/sh\nexec %s --sysroot=${WRKDIR} -isystem=${LOCALBASE}/lib/gcc9/include/c++ -isystem=%s -Wl,-rpath=${LOCALBASE}/lib/gcc9 -L${WRKDIR}${LOCALBASE}/lib/gcc9 "$$@"\n' "$${gcc}" "$${cxxinc}" \ > ${WRKDIR}/${_RUST_TARGET}-c++ .elif ${FLAVOR} == powerpc64_elfv2 @${PRINTF} '#!/bin/sh\nexec ${CC} --sysroot=${WRKDIR} -mabi=elfv2 --target=${_RUST_LLVM_TRIPLE} "$$@"\n' \ > ${WRKDIR}/${_RUST_TARGET}-cc @${PRINTF} '#!/bin/sh\nexec ${CXX} --sysroot=${WRKDIR} -mabi=elfv2 --target=${_RUST_LLVM_TRIPLE} -stdlib=libc++ "$$@"\n' \ > ${WRKDIR}/${_RUST_TARGET}-c++ .else @${PRINTF} '#!/bin/sh\nexec ${CC} --sysroot=${WRKDIR} --target=${_RUST_LLVM_TRIPLE} "$$@"\n' \ > ${WRKDIR}/${_RUST_TARGET}-cc @${PRINTF} '#!/bin/sh\nexec ${CXX} --sysroot=${WRKDIR} --target=${_RUST_LLVM_TRIPLE} -stdlib=libc++ "$$@"\n' \ > ${WRKDIR}/${_RUST_TARGET}-c++ .endif @${CHMOD} +x ${WRKDIR}/${_RUST_TARGET}-c* # sanity check cross compilers. we cannot execute the result but # at least check that it can link a simple program before going further. @${PRINTF} '#include \nint main(){return printf("hello\\n");}' | ${WRKDIR}/${_RUST_TARGET}-cc -o ${WRKDIR}/test-c -xc - # produce some useful info for the build logs like what release/arch test-c is compiled for @cd ${WRKDIR} && ${FILE} test-c && ${READELF} -A test-c @${PRINTF} '#include \nint main(){std::cout<<"hello"<> ${TMPPLIST} .if !defined(_RUST_MAKESUM_GUARD) makesum: ${MAKE} -D_RUST_MAKESUM_GUARD makesum FLAVOR=${FLAVORS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp .for _flavor in ${FLAVORS:O:[2..-1]} ${MAKE} -D_RUST_MAKESUM_GUARD makesum FLAVOR=${_flavor} DISTINFO_FILE=${DISTINFO_FILE}.${_flavor} ${SED} 1d ${DISTINFO_FILE}.${_flavor} >> ${DISTINFO_FILE}.tmp ${RM} ${DISTINFO_FILE}.${_flavor} .endfor ${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE} ${RM} ${DISTINFO_FILE}.tmp .endif .include RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} Index: head/lang/rust-bootstrap/distinfo =================================================================== --- head/lang/rust-bootstrap/distinfo (revision 534268) +++ head/lang/rust-bootstrap/distinfo (revision 534269) @@ -1,19 +1,19 @@ -TIMESTAMP = 1587438306 -SHA256 (rust/rustc-1.43.0-src.tar.xz) = d0899933840369f07394b211cb0b53a5cd4634907633f0bee541133c8b75e309 -SIZE (rust/rustc-1.43.0-src.tar.xz) = 94354332 +TIMESTAMP = 1588774437 +SHA256 (rust/rustc-1.43.1-src.tar.xz) = eb0a103c67c4565403d9e6f84a1c708982a5e9e5b3c0d831e4d6f6451795d106 +SIZE (rust/rustc-1.43.1-src.tar.xz) = 94405276 SHA256 (FreeBSD-11.3-RELEASE-arm64.tar.xz) = 0c1ee2bdbec3b6b404edef6858f38f5cdacd727abc53b1dee23910cab939d0c1 SIZE (FreeBSD-11.3-RELEASE-arm64.tar.xz) = 97990888 SHA256 (FreeBSD-11.3-RELEASE-amd64.tar.xz) = 4599023ac136325b86f2fddeec64c1624daa83657e40b00b2ef944c81463a4ff SIZE (FreeBSD-11.3-RELEASE-amd64.tar.xz) = 117877900 SHA256 (FreeBSD-11.3-RELEASE-arm-armv6.tar.xz) = 1d8025c4a51f025211fb6b4b24ba26144906ff288694394c1c3b1c6e0011db03 SIZE (FreeBSD-11.3-RELEASE-arm-armv6.tar.xz) = 46549572 SHA256 (FreeBSD-12.1-RELEASE-arm-armv7.tar.xz) = 0292ce8186908b3e4b5eb5e5923e1f43d22fcb0ab7f6071b493fcc17d386deab SIZE (FreeBSD-12.1-RELEASE-arm-armv7.tar.xz) = 83402220 SHA256 (FreeBSD-11.3-RELEASE-i386.tar.xz) = 9c0adb8c34b7e11d277c2fb9354f7864d91a4620e5238d7eb9dbfe51601ed5cb SIZE (FreeBSD-11.3-RELEASE-i386.tar.xz) = 94399236 SHA256 (FreeBSD-12.1-RELEASE-powerpc64-elfv1.tar.xz) = 2223e22babc169260f9a3f03bbbaf926ef76b1c44d2e81fb172f907ab8fd7aac SIZE (FreeBSD-12.1-RELEASE-powerpc64-elfv1.tar.xz) = 108905368 SHA256 (FreeBSD-12.1-RELEASE-powerpc64-elfv1-gcc9-9.2.0.tar.xz) = fe208feb93a75e6043e1cd1b9e50be853858d6d600296aaf2b25b55525e58bb2 SIZE (FreeBSD-12.1-RELEASE-powerpc64-elfv1-gcc9-9.2.0.tar.xz) = 38150240 SHA256 (FreeBSD-13.0-CURRENT-powerpc64-elfv2-r356261.tar.xz) = db762f136e41dd3c6676d6dc104282be6d6d6684afb348506fc44ceccd43ce17 SIZE (FreeBSD-13.0-CURRENT-powerpc64-elfv2-r356261.tar.xz) = 150455928