Date: Tue, 16 Jul 2019 15:49:35 +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: r506748 - head/lang/rust Message-ID: <201907161549.x6GFnZVF008370@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Jul 16 15:49:35 2019 New Revision: 506748 URL: https://svnweb.freebsd.org/changeset/ports/506748 Log: lang/rust: Clean up more things - Drop pre-install target: `make restage` should be run after a failed `make stage` to wipe out and repopulate the staging directory. No need to hack around this. - Drop RUST_MANIFESTS, it is only one value after r490852 and now only used once in post-install. - Drop RUST_CHANNEL. It is only used in do-configure. - Drop LLNEXTGEN option. There are no references to LLNextgen in the Rust sources, so it appears to not be used for anything anymore. Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Tue Jul 16 15:44:11 2019 (r506747) +++ head/lang/rust/Makefile Tue Jul 16 15:49:35 2019 (r506748) @@ -51,8 +51,6 @@ CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTR CARGO_VENDOR_DIR?= ${WRKSRC}/vendor -RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} - # Rust's target arch string is different from *BSD arch strings RUST_ARCH_aarch64= aarch64 RUST_ARCH_amd64= x86_64 @@ -67,19 +65,12 @@ PLIST_SUB+= RUST_TARGET=${RUST_TARGET} USES= compiler gmake libedit pkgconfig python:2.7,build ssl tar:xz -OPTIONS_DEFINE= DOCS GDB LLNEXTGEN SOURCES +OPTIONS_DEFINE= DOCS GDB SOURCES GDB_DESC= Install ports gdb (necessary for debugging rust programs) -LLNEXTGEN_DESC= Build with grammar verification SOURCES_DESC= Install source files GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb -LLNEXTGEN_BUILD_DEPENDS= LLnextgen:devel/llnextgen -# Rust manifests list all files and directories installed by rust-installer. -# We use them in: -# - pre-install to cleanup the ${STAGEDIR} -# - post-install to populate the ${TMPPLIST} -RUST_MANIFESTS= lib/rustlib/manifest-* PLIST_FILES= lib/rustlib/components \ lib/rustlib/rust-installer-version @@ -151,7 +142,7 @@ do-configure: -e 's,%SYSCONFDIR%,${PREFIX}/etc,' \ -e 's,%MANDIR%,${MANPREFIX}/man,' \ -e 's,%PYTHON_CMD%,${PYTHON_CMD},' \ - -e 's,%CHANNEL%,${RUST_CHANNEL},' \ + -e 's,%CHANNEL%,${PKGNAMESUFFIX:Ustable:S/^-//},' \ -e 's,%TARGET%,${RUST_TARGET},' \ -e 's,%CCACHE%,${CCACHE_VALUE},' \ -e 's,%CC%,${CC},' \ @@ -182,23 +173,6 @@ do-build: --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} -# In case the previous "make stage" failed, this ensures rust's -# install.sh won't backup previously staged files before reinstalling -# new ones. Otherwise, the staging directory is polluted with unneeded -# files. -pre-install: - @for f in ${RUST_MANIFESTS:S,^,${STAGEDIR}${PREFIX}/,}; do \ - if test -f "$$f"; then \ - ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \ - < "$$f" \ - | ${XARGS} ${RM} -r; \ - ${RM} "$$f"; \ - fi; \ - done - @for f in ${PLIST_FILES:S,^,${STAGEDIR}${PREFIX}/,}; do \ - ${RM} "$$f"; \ - done - do-install: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ @@ -223,7 +197,7 @@ do-install: # We fix manpage entries in the generated manifests because Rust # installs them uncompressed but the Ports framework compresses them. post-install: - for f in ${RUST_MANIFESTS:S,^,${STAGEDIR}${PREFIX}/,}; do \ + for f in ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-*; do \ ${REINPLACE_CMD} -i '' -E \ -e 's|:${STAGEDIR}|:|' \ -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907161549.x6GFnZVF008370>