Index: head/lang/rust/Makefile =================================================================== --- head/lang/rust/Makefile (revision 487455) +++ head/lang/rust/Makefile (revision 487456) @@ -1,405 +1,409 @@ # Created by: Jyun-Yan You # $FreeBSD$ PORTNAME= rust PORTVERSION?= 1.31.0 PORTREVISION?= 0 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 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 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-10-25 RUST_BOOTSTRAP_VERSION?= 1.30.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.31.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-clippy-preview \ 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}" \ LIBGIT2_SYS_USE_PKG_CONFIG=1 \ LIBSSH2_SYS_USE_PKG_CONFIG=1 \ OPENSSL_DIR="${OPENSSLBASE}" X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py -CRATES_PATCHED_BY_FBSD10_FIX= src/vendor/libssh2-sys \ +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/libgit2-sys" \ "${WRKSRC}/src/vendor/openssl"; 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 +.if !target(pre-configure) pre-configure: @for file in \ ${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/configure \ ${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \ mv "$$file" "$$file.dont-fix"; \ done +.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 +.if !target(post-configure) post-configure: @for file in \ ${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/configure \ ${WRKSRC}/src/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \ mv "$$file.dont-fix" "$$file"; \ done +.endif 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' \ --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-clippy \ ${STAGEDIR}${PREFIX}/bin/cargo-fmt \ ${STAGEDIR}${PREFIX}/bin/clippy-driver \ ${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: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-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 487455) +++ head/lang/rust-nightly/Makefile (revision 487456) @@ -1,29 +1,53 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ -PORTVERSION= 1.25.0.${NIGHTLY_DATE:C,-,,g} +PORTVERSION= 1.32.0.${NIGHTLY_DATE:C,-,,g} PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -CONFLICTS_BUILD= rust # see FIXME in `pre-fetch` in lang/rust/Makefile CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz -NIGHTLY_DATE= 2018-04-03 +# https://static.rust-lang.org/dist/channel-rust-nightly.toml +NIGHTLY_DATE= 2018-12-14 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date -BOOTSTRAPS_DATE= 2018-03-18 +BOOTSTRAPS_DATE= 2018-12-09 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta +# Other bootstraps aren't provided by upstream yet ONLY_FOR_ARCHS= amd64 i386 -IGNORE= is older than stable version. Get nightly via rustup or \ - use lang/rust and pass RUSTC_BOOTSTRAP=1 via environ(7) + +# Same as lang/rust except for src/vendor/ -> vendor/ +CRATES_PATCHED_BY_FBSD10_FIX= vendor/libssh2-sys \ + vendor/lzma-sys + +post-patch: nightly-post-patch +nightly-post-patch: +# Work around unused_unsafe errors in libcore with stage0 + @${REINPLACE_CMD} '/RUSTC_DENY_WARNINGS/d' ${WRKSRC}/src/bootstrap/builder.rs + +# Same as lang/rust except for src/vendor/ -> vendor/ +pre-configure: + @for file in \ + ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \ + ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \ + mv "$$file" "$$file.dont-fix"; \ + done + +# Same as lang/rust except for src/vendor/ -> vendor/ +post-configure: + @for file in \ + ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/configure \ + ${WRKSRC}/vendor/backtrace-sys/src/libbacktrace/config/libtool.m4; do \ + mv "$$file.dont-fix" "$$file"; \ + done .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 487455) +++ head/lang/rust-nightly/distinfo (revision 487456) @@ -1,15 +1,15 @@ -SHA256 (rust/2018-03-18/cargo-beta-i686-unknown-freebsd.tar.gz) = 801354131957df03abedc8b11be483520941632a6976a7fdefde157e53b70391 -SIZE (rust/2018-03-18/cargo-beta-i686-unknown-freebsd.tar.gz) = 4918903 -SHA256 (rust/2018-03-18/cargo-beta-x86_64-unknown-freebsd.tar.gz) = ed420d91219f86ffa586cd773f19f75c0e192b683e7a7282580faf5b72c7b9de -SIZE (rust/2018-03-18/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 5209143 -SHA256 (rust/2018-03-18/rust-std-beta-i686-unknown-freebsd.tar.gz) = 5a8135389201352f79ee16bd13555fbb192012c43733c997dc6a60061f6b24a6 -SIZE (rust/2018-03-18/rust-std-beta-i686-unknown-freebsd.tar.gz) = 50414392 -SHA256 (rust/2018-03-18/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 86907a7beaa22f52bd093898e0818048bb1ef4b2d45968fb794f69425c345004 -SIZE (rust/2018-03-18/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 50222097 -SHA256 (rust/2018-03-18/rustc-beta-i686-unknown-freebsd.tar.gz) = 3c34727da3299eb2f847320221eb258b1eac7a2ccca6e2b0b4752c32c763fc17 -SIZE (rust/2018-03-18/rustc-beta-i686-unknown-freebsd.tar.gz) = 56749552 -SHA256 (rust/2018-03-18/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 2d00f24c2bfd8112d798d0aab70ec60f12ad6978b5029f83d477345101a46cba -SIZE (rust/2018-03-18/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 56562280 -SHA256 (rust/2018-04-03/rustc-nightly-src.tar.xz) = 41eb01d8cb8d60e3c2f7106561f1fc9025b3c2dbe08500ab61ce0711ad9f67b8 -SIZE (rust/2018-04-03/rustc-nightly-src.tar.xz) = 54623116 -TIMESTAMP = 1522784477 +TIMESTAMP = 1544723442 +SHA256 (rust/2018-12-14/rustc-nightly-src.tar.xz) = 0883dff11043cc07649ed9d02bc7f96f44d71ab8d91261ce141af3cab5dfcbb9 +SIZE (rust/2018-12-14/rustc-nightly-src.tar.xz) = 100389872 +SHA256 (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 1c59a13cc385c9e06b80202651f8af9e9e22658e1863de85ce67ca12a0940a46 +SIZE (rust/2018-12-09/rustc-beta-x86_64-unknown-freebsd.tar.gz) = 70377440 +SHA256 (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 12fa39ff525ddd64490e63be98b954c9ee66e0cf603143f49b04f1c5760f3885 +SIZE (rust/2018-12-09/rust-std-beta-x86_64-unknown-freebsd.tar.gz) = 67038294 +SHA256 (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 054d227205949638483fc13035c0657177ebe0e48da24b77f406c86b35aef0a0 +SIZE (rust/2018-12-09/cargo-beta-x86_64-unknown-freebsd.tar.gz) = 6256857 +SHA256 (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = e01e810b8aa0e985d78918cc8934796b6c440e5bb87fd969c4ad074106492cea +SIZE (rust/2018-12-09/rustc-beta-i686-unknown-freebsd.tar.gz) = 71112245 +SHA256 (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 869efa046038c4bebec34cc04f1187fbae70dda9294effccce31510a3365b775 +SIZE (rust/2018-12-09/rust-std-beta-i686-unknown-freebsd.tar.gz) = 67329498 +SHA256 (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = dcf240699f5a00a97350a8cb47653da2633e33deb9ad4e85a979c81ab2e59072 +SIZE (rust/2018-12-09/cargo-beta-i686-unknown-freebsd.tar.gz) = 6020090 Index: head/lang/rust-nightly/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs =================================================================== --- head/lang/rust-nightly/files/patch-src_librustc__back_target_i686__unknown__freebsd.rs (revision 487455) +++ head/lang/rust-nightly/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-nightly/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-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs =================================================================== --- head/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs (nonexistent) +++ head/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs (revision 487456) @@ -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-nightly/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-nightly/files/patch-src_libstd_build.rs =================================================================== --- head/lang/rust-nightly/files/patch-src_libstd_build.rs (nonexistent) +++ head/lang/rust-nightly/files/patch-src_libstd_build.rs (revision 487456) @@ -0,0 +1,22 @@ +--- src/libstd/build.rs.orig 2018-09-03 18:29:12 UTC ++++ src/libstd/build.rs +@@ -94,13 +94,18 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> + .out_dir(&native.out_dir) + .warnings(false) + .file("../libbacktrace/alloc.c") +- .file("../libbacktrace/backtrace.c") + .file("../libbacktrace/dwarf.c") + .file("../libbacktrace/fileline.c") + .file("../libbacktrace/posix.c") + .file("../libbacktrace/read.c") + .file("../libbacktrace/sort.c") + .file("../libbacktrace/state.c"); ++ ++ if target.contains("freebsd") { ++ build.file("../libbacktrace/nounwind.c"); ++ } else { ++ build.file("../libbacktrace/backtrace.c"); ++ } + + if target.contains("darwin") { + build.file("../libbacktrace/macho.c"); Property changes on: head/lang/rust-nightly/files/patch-src_libstd_build.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-nightly/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py =================================================================== --- head/lang/rust-nightly/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py (revision 487455) +++ head/lang/rust-nightly/files/patch-src_llvm_utils_llvm-build_llvmbuild_main.py (revision 487456) @@ -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)