From owner-svn-ports-all@freebsd.org Tue Jan 7 07:01:46 2020 Return-Path: Delivered-To: svn-ports-all@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 BEBC41EA44D; Tue, 7 Jan 2020 07:01:46 +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 47sNbG4kkKz3JDS; Tue, 7 Jan 2020 07:01:46 +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 858E8232D3; Tue, 7 Jan 2020 07:01:46 +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 00771kYW026523; Tue, 7 Jan 2020 07:01:46 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00771kKw026522; Tue, 7 Jan 2020 07:01:46 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202001070701.00771kKw026522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 7 Jan 2020 07:01:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522316 - in head/lang/rust: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/lang/rust: . files X-SVN-Commit-Revision: 522316 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jan 2020 07:01:46 -0000 Author: tobik Date: Tue Jan 7 07:01:46 2020 New Revision: 522316 URL: https://svnweb.freebsd.org/changeset/ports/522316 Log: lang/rust: Simplify do-configure and garbage collect files/config.toml Deleted: head/lang/rust/files/config.toml Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Tue Jan 7 04:55:40 2020 (r522315) +++ head/lang/rust/Makefile Tue Jan 7 07:01:46 2020 (r522316) @@ -141,32 +141,36 @@ post-patch-SOURCES-off: @${REINPLACE_CMD} -e 's/config.tools.*"src".*/false;/' \ ${WRKSRC}/src/bootstrap/install.rs +do-configure: + @${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} '[install]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'mandir="${MANPREFIX}/man"' >> ${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} '[llvm]' >> ${WRKSRC}/config.toml .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) -CCACHE_VALUE= "${CCACHE_BIN}" + @${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml .else -CCACHE_VALUE= false + @${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml .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%,${PKGNAMESUFFIX:Ustable:S/^-//},' \ - -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}",' \ - -e 's,^#experimental-targets =.*,experimental-targets = "",' \ - ${WRKSRC}/config.toml + @${ECHO_CMD} 'targets="${_LLVM_TARGET}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'experimental-targets=""' >> ${WRKSRC}/config.toml .endif + @${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml + @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml + @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \ ${WRKSRC}/src/librustc_llvm/build.rs \ ${WRKSRC}/src/bootstrap/native.rs