From owner-svn-ports-head@freebsd.org Tue Jul 16 15:49:35 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DB3F0B2DEE; Tue, 16 Jul 2019 15:49:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC2288B610; Tue, 16 Jul 2019 15:49:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C981819E; Tue, 16 Jul 2019 15:49:35 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6GFnZmP008371; Tue, 16 Jul 2019 15:49:35 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6GFnZVF008370; Tue, 16 Jul 2019 15:49:35 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201907161549.x6GFnZVF008370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 16 Jul 2019 15:49:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506748 - head/lang/rust X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/lang/rust X-SVN-Commit-Revision: 506748 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BC2288B610 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2019 15:49:35 -0000 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|' \