Date: Tue, 17 Sep 2019 16:35:11 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512213 - head/lang/rust Message-ID: <201909171635.x8HGZB9D078185@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Sep 17 16:35:11 2019 New Revision: 512213 URL: https://svnweb.freebsd.org/changeset/ports/512213 Log: lang/rust: Cleanup part 4 - Spell LICENSE_FILE_APACHE20 correctly - Move gmake to BUILD_DEPENDS directly. gmake is called during the build by some crates but is not the primary build tool. - Move variables around to be more in line with the recommendations in the Porter's Handbook - Mark port local non-overridable variables as "private" - Reduce noise of RUST_ARCH_*: only keep the overrides when they differ from ${ARCH} - Drop unused RUST_TARGET plist sub - Move post-configure-DOCS-* into do-configure Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Tue Sep 17 15:56:16 2019 (r512212) +++ head/lang/rust/Makefile Tue Sep 17 16:35:11 2019 (r512213) @@ -13,9 +13,9 @@ MASTER_SITES= https://static.rust-lang.org/dist/:src \ https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/:compiler_rt DISTNAME?= ${PORTNAME}c-${PORTVERSION}-src DISTFILES?= ${NIGHTLY_SUBDIR}${DISTNAME}${EXTRACT_SUFX}:src \ - ${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \ - ${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \ - ${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:cargo_bootstrap \ + ${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \ + ${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:rust_bootstrap \ + ${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz:cargo_bootstrap \ ${DISTFILES_${ARCH}} DISTFILES_armv6= compiler-rt-8.0.1.src.tar.xz:compiler_rt DIST_SUBDIR?= rust @@ -24,59 +24,55 @@ EXTRACT_ONLY?= ${DISTFILES:N*\:*bootstrap:C/:.*//} MAINTAINER= rust@FreeBSD.org COMMENT= Language with a focus on memory safety and concurrency -LICENSE= APACHE20 \ - MIT +LICENSE= APACHE20 MIT LICENSE_COMB= dual -LICENSE_FILE_APACHE= ${WRKSRC}/LICENSE-APACHE +LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= cmake:devel/cmake -LIB_DEPENDS= libcurl.so:ftp/curl \ - libgit2.so:devel/libgit2 \ - libssh2.so:security/libssh2 - ONLY_FOR_ARCHS?= aarch64 amd64 armv6 armv7 i386 powerpc64 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler -CONFLICTS_INSTALL?= rust-nightly +BUILD_DEPENDS= cmake:devel/cmake \ + gmake:devel/gmake +LIB_DEPENDS= libcurl.so:ftp/curl \ + libgit2.so:devel/libgit2 \ + libssh2.so:security/libssh2 -# See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2019-07-04 -BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} -BOOTSTRAPS_SUFFIX_powerpc64?= -elfv1 +USES= libedit pkgconfig python:2.7,build ssl tar:xz -RUST_BOOTSTRAP_VERSION?= 1.36.0 -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} +CONFLICTS_INSTALL?= rust-nightly -CARGO_BOOTSTRAP_VERSION?= 0.37.0 -CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET} +PLIST_FILES= lib/rustlib/components \ + lib/rustlib/rust-installer-version -CARGO_VENDOR_DIR?= ${WRKSRC}/vendor +OPTIONS_DEFINE= DOCS GDB SOURCES +GDB_DESC= Install ports gdb (necessary for debugging rust programs) +SOURCES_DESC= Install source files -# Rust's target arch string is different from *BSD arch strings -RUST_ARCH_aarch64= aarch64 -RUST_ARCH_amd64= x86_64 -RUST_ARCH_armv6= armv6 -RUST_ARCH_armv7= armv7 -RUST_ARCH_i386= i686 -RUST_ARCH_powerpc64= powerpc64 -RUST_ARCH_x86_64= x86_64 # dragonfly -RUST_TARGET= ${RUST_ARCH_${ARCH}}-unknown-${OPSYS:tl} -LLVM_TARGET= ${ARCH:C/armv.*/ARM/:S/aarch64/AArch64/:S/powerpc64/PowerPC/} -PLIST_SUB+= RUST_TARGET=${RUST_TARGET} +DOCS_VARS_OFF= _RUST_BUILD_DOCS=false +DOCS_VARS= _RUST_BUILD_DOCS=true +GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb -USES= compiler gmake libedit pkgconfig python:2.7,build ssl tar:xz +# See WRKSRC/src/stage0.txt for the date and version values. +BOOTSTRAPS_DATE?= 2019-07-04 +RUST_BOOTSTRAP_VERSION?= 1.36.0 +CARGO_BOOTSTRAP_VERSION?= 0.37.0 -OPTIONS_DEFINE= DOCS GDB SOURCES -GDB_DESC= Install ports gdb (necessary for debugging rust programs) -SOURCES_DESC= Install source files +BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} +BOOTSTRAPS_SUFFIX_powerpc64?= -elfv1 -GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb +CARGO_VENDOR_DIR?= ${WRKSRC}/vendor -PLIST_FILES= lib/rustlib/components \ - lib/rustlib/rust-installer-version +# 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} +_LLVM_TARGET= ${ARCH:C/armv.*/ARM/:S/aarch64/AArch64/:S/powerpc64/PowerPC/} +_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 <bsd.port.pre.mk> .if ${ARCH} == powerpc64 @@ -104,12 +100,12 @@ X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py post-extract: @${MKDIR} ${WRKSRC}/build/cache/${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}} - ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ - ${WRKSRC}/build/cache/${RUSTC_BOOTSTRAP}.tar.gz - ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ - ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP}.tar.gz - ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ - ${WRKSRC}/build/cache/${CARGO_BOOTSTRAP}.tar.gz + ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ + ${WRKSRC}/build/cache/${_RUSTC_BOOTSTRAP}.tar.gz + ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ + ${WRKSRC}/build/cache/${_RUST_STD_BOOTSTRAP}.tar.gz + ${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${_CARGO_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ + ${WRKSRC}/build/cache/${_CARGO_BOOTSTRAP}.tar.gz .if ${ARCH} == armv6 ${LN} -sf ${WRKDIR}/compiler-rt-8.0.1.src ${WRKSRC}/src/llvm-project/compiler-rt .endif @@ -149,15 +145,16 @@ do-configure: -e 's,%MANDIR%,${MANPREFIX}/man,' \ -e 's,%PYTHON_CMD%,${PYTHON_CMD},' \ -e 's,%CHANNEL%,${PKGNAMESUFFIX:Ustable:S/^-//},' \ - -e 's,%TARGET%,${RUST_TARGET},' \ + -e 's,%TARGET%,${_RUST_TARGET},' \ -e 's,%CCACHE%,${CCACHE_VALUE},' \ -e 's,%CC%,${CC},' \ -e 's,%CXX%,${CXX},' \ + -e 's,%DOCS%,${_RUST_BUILD_DOCS},' \ < ${FILESDIR}/config.toml \ > ${WRKSRC}/config.toml # no need to build a crosscompiler for these targets .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 - @${REINPLACE_CMD} -e 's,^#targets =.*,targets = "${LLVM_TARGET}",' \ + @${REINPLACE_CMD} -e 's,^#targets =.*,targets = "${_LLVM_TARGET}",' \ -e 's,^#experimental-targets =.*,experimental-targets = "",' \ ${WRKSRC}/config.toml .endif @@ -165,12 +162,6 @@ do-configure: ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs -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} \ @@ -248,14 +239,14 @@ makesum: ${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]} ${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch} - ${GREP} ${RUST_ARCH_${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE} + ${GREP} ${_RUST_ARCH_${arch}:U${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE} .for file in ${DISTFILES_${arch}} ${GREP} ${file:S,:, ,:[1]} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE} .endfor ${RM} ${DISTINFO_FILE}.${arch} .endfor ${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=powerpc64 BOOTSTRAPS_SUFFIX="-elfv2" DISTINFO_FILE=${DISTINFO_FILE}.powerpc64-elfv2 - ${GREP} ${RUST_ARCH_powerpc64} ${DISTINFO_FILE}.powerpc64-elfv2 >> ${DISTINFO_FILE} + ${GREP} ${_RUST_ARCH_powerpc64:Upowerpc64} ${DISTINFO_FILE}.powerpc64-elfv2 >> ${DISTINFO_FILE} ${RM} ${DISTINFO_FILE}.powerpc64-elfv2 .endif @@ -276,24 +267,24 @@ package-to-bootstraps: ${BOOTSTRAPS_SOURCE_PKG} --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} && \ + ${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}${BOOTSTRAPS_SUFFIX}.tar.gz \ - rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} + -f ${_DISTDIR}/${_RUSTC_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ + 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} + ${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}${BOOTSTRAPS_SUFFIX}.tar.gz \ - rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET} + -f ${_DISTDIR}/${_RUST_STD_BOOTSTRAP}${BOOTSTRAPS_SUFFIX}.tar.gz \ + rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} ${BOOTSTRAPS_SOURCE_PKG}: ${MKDIR} ${@:H}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909171635.x8HGZB9D078185>