Date: Thu, 7 Apr 2016 07:17:45 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412657 - head/lang/rust Message-ID: <201604070717.u377Hj9Y072050@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Apr 7 07:17:45 2016 New Revision: 412657 URL: https://svnweb.freebsd.org/changeset/ports/412657 Log: lang/rust: unbreak non-poudriere build after r412305 gmake[1]: Leaving directory '/wrkdirs/usr/ports/lang/rust/work/rustc-1.7.0' sed: /wrkdirs/usr/ports/lang/rust/work/stage/usr/local/lib/rustlib/manifest-rust-std-x86_64-unknown-: No such file or directory *** Error code 1 PR: 208527 Pointy hat: jbeich Tested by: Marko Cupać <marko.cupac@mimar.rs>, pilot513@gmail.com Approved by: riggs (maintainer) MFH: 2016Q2 Modified: head/lang/rust/Makefile (contents, props changed) Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Thu Apr 7 03:59:58 2016 (r412656) +++ head/lang/rust/Makefile Thu Apr 7 07:17:45 2016 (r412657) @@ -125,13 +125,13 @@ post-patch: # new ones. Otherwise, the staging directory is polluted with unneeded # files. pre-install: -.for f in manifest-rustc manifest-rust-std-${RUST_TARGET} - @if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/${f}; then \ + @for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ + if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ - < ${STAGEDIR}${PREFIX}/lib/rustlib/${f} \ + < ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \ | ${XARGS} ${RM}; \ - fi -.endfor + fi; \ + done @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/components \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \ @@ -140,11 +140,11 @@ pre-install: ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh post-install: -.for f in manifest-rustc manifest-rust-std-${RUST_TARGET} - @${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ - ${STAGEDIR}${PREFIX}/lib/rustlib/${f} - @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/${f}.bak -.endfor + @for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \ + ${REINPLACE_CMD} -e 's|${STAGEDIR}||' \ + ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \ + ${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \ + done @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped, # but they contain non-object files which make strip(1) unhappy.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604070717.u377Hj9Y072050>