From owner-svn-ports-branches@freebsd.org Sat Jan 11 09:32:58 2020 Return-Path: Delivered-To: svn-ports-branches@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 CC04522382B; Sat, 11 Jan 2020 09:32:58 +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 47vvlt54qJz3JBV; Sat, 11 Jan 2020 09:32:58 +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 A9412B6C; Sat, 11 Jan 2020 09:32:58 +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 00B9WwHD002965; Sat, 11 Jan 2020 09:32:58 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00B9WwsT002964; Sat, 11 Jan 2020 09:32:58 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202001110932.00B9WwsT002964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 11 Jan 2020 09:32:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r522641 - in branches/2020Q1/lang/rust: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2020Q1/lang/rust: . files X-SVN-Commit-Revision: 522641 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 09:32:58 -0000 Author: tobik Date: Sat Jan 11 09:32:58 2020 New Revision: 522641 URL: https://svnweb.freebsd.org/changeset/ports/522641 Log: MFH: r522316 r522638 r522639 lang/rust: Simplify do-configure and garbage collect files/config.toml lang/rust: fix powerpc64 elfv2 bootstrap Apparently there were some issues with the previous one. PR: 243253 Submitted by: mikael.urankar@gmail.com Reported by: jhibbits, pkubaj Tested by: pkubaj lang/rust: increase build verbosity and produce better build logs Approved by: ports-secteam blanket Deleted: branches/2020Q1/lang/rust/files/config.toml Modified: branches/2020Q1/lang/rust/Makefile branches/2020Q1/lang/rust/distinfo Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/lang/rust/Makefile ============================================================================== --- branches/2020Q1/lang/rust/Makefile Sat Jan 11 09:30:16 2020 (r522640) +++ branches/2020Q1/lang/rust/Makefile Sat Jan 11 09:32:58 2020 (r522641) @@ -141,32 +141,38 @@ 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} 'verbose=2' >> ${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} 'verbose-tests=true' >> ${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 @@ -175,7 +181,6 @@ do-build: cd ${WRKSRC} && \ ${SETENV} ${X_PY_ENV} \ ${X_PY_CMD} build \ - --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} @@ -184,7 +189,6 @@ do-install: ${SETENV} ${X_PY_ENV} \ DESTDIR=${STAGEDIR} \ ${X_PY_CMD} 'install' \ - --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} @@ -239,7 +243,6 @@ do-test: ${SETENV} ${X_PY_ENV} \ ALLOW_NONZERO_RLIMIT_CORE=1 \ ${X_PY_CMD} test \ - --verbose \ --config ./config.toml \ --jobs ${MAKE_JOBS_NUMBER} Modified: branches/2020Q1/lang/rust/distinfo ============================================================================== --- branches/2020Q1/lang/rust/distinfo Sat Jan 11 09:30:16 2020 (r522640) +++ branches/2020Q1/lang/rust/distinfo Sat Jan 11 09:32:58 2020 (r522641) @@ -1,4 +1,4 @@ -TIMESTAMP = 1576623023 +TIMESTAMP = 1578730697 SHA256 (rust/rustc-1.40.0-src.tar.xz) = 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace SIZE (rust/rustc-1.40.0-src.tar.xz) = 92306352 SHA256 (rust/2019-11-07/rustc-1.39.0-aarch64-unknown-freebsd.tar.xz) = 44098962a570e05d691d3b7c3337b873b1e1f22ac49fd19c0d5d3362c0008eb5 @@ -39,9 +39,9 @@ SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unkn SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 164834720 SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 707eef9bac71a44db8e1d64c70a771fbac1f81f7ca58a2e3025ec1cc4d263b18 SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 3423776 -SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = e615095f1fb2017938147da213d04444b785ae34128c4aa9099996f0de610a52 -SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 24519864 -SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = fb83397a7b6abfcf292ed50f8c277617c2e77686778ca853ca2228f7aa5d7a84 -SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 163807368 -SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = aeebed336e09121f4d8803b5b6c2814a0901773a65bce9bd091a06d6082ac978 -SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 2753592 +SHA256 (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 65a7eed0737ae94e54d60a0cf5cc67634fb8ddd978bdfb0ce4e5f46d309daa0a +SIZE (rust/2019-11-07/rustc-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 24483956 +SHA256 (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 60782554de07997c25bf2aa279b44baa8009158b25cc3c5364b1496a2d40f2a4 +SIZE (rust/2019-11-07/rust-std-1.39.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 163926244 +SHA256 (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 75ecd88d83e8f394ce33f0213b622a045cbcfc55973f4b5140403de298f73968 +SIZE (rust/2019-11-07/cargo-0.40.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3268696