diff options
author | Ed Maste <emaste@FreeBSD.org> | 2017-11-20 22:23:37 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2017-11-20 22:23:37 +0000 |
commit | 0dcfa619d3e2a194e74a12725a7765b8bc0b76f4 (patch) | |
tree | bf5515950276a96048df91a00c732b21693c88fc /sysutils/safecat | |
parent | 74163d0cd3ae3e8ef0cfdbb01adc5813201a5c2e (diff) | |
download | ports-0dcfa619d3e2a194e74a12725a7765b8bc0b76f4.tar.gz ports-0dcfa619d3e2a194e74a12725a7765b8bc0b76f4.zip |
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.
PR: 221811
Approved by: matthew
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=454582
Diffstat (limited to 'sysutils/safecat')
-rw-r--r-- | sysutils/safecat/files/patch-Makefile | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/sysutils/safecat/files/patch-Makefile b/sysutils/safecat/files/patch-Makefile new file mode 100644 index 000000000000..2aaaf3140b96 --- /dev/null +++ b/sysutils/safecat/files/patch-Makefile @@ -0,0 +1,35 @@ + 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. +--- 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: \ |