commit 8e39753db8ae855b92ce9b20d5a597a055f1c04c Author: Ed Maste Date: Fri Aug 25 13:37:50 2017 -0400 sysutils/safecat: avoid duplicating object files in library Previously byte_copy.o and str_len.o were added to str.a, and then specified as objects on the safecat link command line along with str. When linking with lld this produces duplicate symbol errors like: /usr/bin/ld: error: duplicate symbol: byte_copy >>> defined at byte_copy.c >>> byte_copy.o:(byte_copy) in archive str.a >>> defined at byte_copy.c >>> byte_copy.o(.text+0x0) As these symbols are provided by str.a just avoid listing the object files as well. diff --git a/sysutils/safecat/files/patch-Makefile b/sysutils/safecat/files/patch-Makefile new file mode 100644 index 000000000000..52302b1d714d --- /dev/null +++ b/sysutils/safecat/files/patch-Makefile @@ -0,0 +1,21 @@ +--- Makefile.orig 2017-08-25 13:36:12.671931000 -0400 ++++ Makefile 2017-08-25 13:36:36.138079000 -0400 +@@ -219,14 +219,14 @@ + + safecat: \ + load safecat.o getln.a str.a stralloc.a strerr.a substdio.a alloc.o \ +-alloc_re.o byte_copy.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ +-hostname.o sig.o stat_dir.o str_diffn.o str_len.o substdio_copy.o \ ++alloc_re.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ ++hostname.o sig.o stat_dir.o str_diffn.o substdio_copy.o \ + substdi.o substdio.o taia_fmtfrac.o taia_now.o taia_tai.o tempfile.o \ + writefile.o + ./load safecat getln.a str.a stralloc.a strerr.a substdio.a \ +- alloc.o alloc_re.o byte_copy.o byte_cr.o envread.o error.o \ ++ alloc.o alloc_re.o byte_cr.o envread.o error.o \ + error_str.o fmt_uint64.o hostname.o sig.o stat_dir.o str_diffn.o \ +- str_len.o substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ ++ substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ + taia_now.o taia_tai.o tempfile.o writefile.o + + safecat.0: \