Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Nov 2017 22:34:23 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r454807 - head/sysutils/safecat/files
Message-ID:  <201711232234.vANMYNIq048895@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste (src committer)
Date: Thu Nov 23 22:34:23 2017
New Revision: 454807
URL: https://svnweb.freebsd.org/changeset/ports/454807

Log:
  sysutils/safecat: fix linking with GNU ld
  
  r454582 fixed linking sysutils/safecat with lld but broke linking with
  GNU ld.
  
  PR:		223832
  Approved by:	antoine

Modified:
  head/sysutils/safecat/files/patch-Makefile

Modified: head/sysutils/safecat/files/patch-Makefile
==============================================================================
--- head/sysutils/safecat/files/patch-Makefile	Thu Nov 23 22:13:33 2017	(r454806)
+++ head/sysutils/safecat/files/patch-Makefile	Thu Nov 23 22:34:23 2017	(r454807)
@@ -12,8 +12,8 @@
     
     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
+--- Makefile.orig	2004-08-16 20:50:09.000000000 -0400
++++ Makefile	2017-11-23 16:49:00.505811000 -0500
 @@ -219,14 +219,14 @@
  
  safecat: \
@@ -24,8 +24,9 @@
 +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 \
+-	./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 \
++	./load safecat getln.a stralloc.a strerr.a substdio.a str.a \
 +	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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711232234.vANMYNIq048895>