From owner-svn-ports-head@freebsd.org Fri Jan 29 10:52:11 2021 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 385A14E6A1E; Fri, 29 Jan 2021 10:52:11 +0000 (UTC) (envelope-from mikael@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRvL319bjz4htQ; Fri, 29 Jan 2021 10:52:11 +0000 (UTC) (envelope-from mikael@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 1190D213DE; Fri, 29 Jan 2021 10:52:11 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10TAqATg048028; Fri, 29 Jan 2021 10:52:10 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10TAqAvh048027; Fri, 29 Jan 2021 10:52:10 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202101291052.10TAqAvh048027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Fri, 29 Jan 2021 10:52:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563192 - head/lang/rust X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: head/lang/rust X-SVN-Commit-Revision: 563192 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 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: Fri, 29 Jan 2021 10:52:11 -0000 Author: mikael Date: Fri Jan 29 10:52:10 2021 New Revision: 563192 URL: https://svnweb.freebsd.org/changeset/ports/563192 Log: lang/rust: revert part of r563191 It contains unrelated changes Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Jan 29 10:49:01 2021 (r563191) +++ head/lang/rust/Makefile Fri Jan 29 10:52:10 2021 (r563192) @@ -32,8 +32,7 @@ ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap co BUILD_DEPENDS= cmake:devel/cmake \ libgit2>=1.0.0:devel/libgit2 \ - ninja:devel/ninja \ - bash>0:shells/bash + ninja:devel/ninja LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 @@ -187,51 +186,21 @@ do-configure: do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py dist --jobs=${MAKE_JOBS_NUMBER} \ - library/std src/librustc cargo clippy rustfmt src - ${RM} -rf ${WRKSRC}/build/tmp/dist + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --jobs=${MAKE_JOBS_NUMBER} -COMPONENTS= rustc-${PORTVERSION}-${_RUST_TARGET} \ - rust-std-${PORTVERSION}-${_RUST_TARGET} \ - cargo-${PORTVERSION}-${_RUST_TARGET} \ - clippy-${PORTVERSION}-${_RUST_TARGET} \ - rustfmt-${PORTVERSION}-${_RUST_TARGET} - -.if ${PORT_OPTIONS:MSOURCES} -COMPONENTS+= rust-src-${PORTVERSION} -.endif - -.if ${PORT_OPTIONS:MWASM} -COMPONENTS+= rust-std-${PORTVERSION}-wasm32-unknown-unknown -.endif - do-install: - @${RM} -r ${WRKSRC}/_extractdist -.for _c in ${COMPONENTS} - ${MKDIR} ${WRKSRC}/_extractdist - cd ${WRKSRC}/_extractdist && ${TAR} xf \ - ${WRKSRC}/build/dist/${_c}.tar.xz - ${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \ - ${WRKSRC}/_extractdist/${_c}/install.sh - cd ${WRKSRC}/_extractdist/${_c} && \ - ${LOCALBASE}/bin/bash ./install.sh \ - --prefix="${STAGEDIR}${PREFIX}" \ - --mandir="${STAGEDIR}${PREFIX}/share/man" - @${RM} -r ${WRKSRC}/_extractdist -.endfor - + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py install --jobs=${MAKE_JOBS_NUMBER} # We autogenerate the plist file. We do that, instead of the # regular pkg-plist, because several libraries have a computed # filename based on the absolute path of the source files. As it # is user-specific, we cannot know their filename in advance. -post-install: - # cleanup @${RM} -r ${STAGEDIR}${DOCSDIR}/*.old \ + ${STAGEDIR}${DOCSDIR}/html/.lock \ + ${STAGEDIR}${DOCSDIR}/html/.stamp \ ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \ - ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh \ - ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \ - ${STAGEDIR}${PREFIX}/lib/rustlib/components \ - ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* + ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \ + ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh @${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -exec ${FILE} -i {} + | \ ${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD} @${FIND} ${STAGEDIR}${PREFIX} -not -type d | \