svn commit: r462750 - head/lang/rust

Bryan Drewery bdrewery at FreeBSD.org
Fri Feb 23 22:14:13 UTC 2018


Author: bdrewery
Date: Fri Feb 23 22:14:12 2018
New Revision: 462750
URL: https://svnweb.freebsd.org/changeset/ports/462750

Log:
  Newer versions (rust-nightly 2018-02-19) pack multiple .o files into
  libstd.  We only need to patch one of them.

Modified:
  head/lang/rust/Makefile

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Fri Feb 23 22:10:33 2018	(r462749)
+++ head/lang/rust/Makefile	Fri Feb 23 22:14:12 2018	(r462750)
@@ -145,7 +145,7 @@ post-extract:
 	(set -ex; cd ${WRKSRC}; \
 	 libstd="$$(echo "${RUST_STD_DIR}/rust-std-${RUST_TARGET}/lib/rustlib/${RUST_TARGET}/lib/"libstd-*.rlib)"; \
 	 hash="$$(basename "$$libstd" .rlib | ${SED} 's/^libstd-//')"; \
-	 std_o="$$(${AR} t "$$libstd" | ${GREP} -E "^std-$$hash.*\.o$$")"; \
+	 std_o="$$(${AR} t "$$libstd" | ${GREP} -E "^std-$$hash.*\.o$$" | ${HEAD} -n 1)"; \
 	 ${AR} x "$$libstd" "$$std_o"; \
 	 ${LD} -r -o std.xx.o "$$std_o" old_fstat.o; \
 	 ${MV} std.xx.o "$$std_o"; \


More information about the svn-ports-head mailing list