svn commit: r289479 - in user/ngie/bug203673: bin/df bin/ls libexec/ftpd usr.bin/netstat usr.bin/procstat usr.bin/w

[Garrett Cooper]

Author: ngie
Date: Sun Oct 18 01:30:23 2015
New Revision: 289479
URL: https://svnweb.freebsd.org/changeset/base/289479

Log:
  Revert the linked library order because it might affect the
  optimization of static binaries and it might affect
  functionality with weak symbols in dynamic binaries
  
  Requested by: bdrewery, imp

Modified:
  user/ngie/bug203673/bin/df/Makefile
  user/ngie/bug203673/bin/ls/Makefile
  user/ngie/bug203673/libexec/ftpd/Makefile
  user/ngie/bug203673/usr.bin/netstat/Makefile
  user/ngie/bug203673/usr.bin/procstat/Makefile
  user/ngie/bug203673/usr.bin/w/Makefile

Modified: user/ngie/bug203673/bin/df/Makefile
==============================================================================
--- user/ngie/bug203673/bin/df/Makefile	Sun Oct 18 01:21:29 2015	(r289478)
+++ user/ngie/bug203673/bin/df/Makefile	Sun Oct 18 01:30:23 2015	(r289479)
@@ -9,6 +9,6 @@ SRCS=	df.c vfslist.c
 
 CFLAGS+= -I${MOUNT}
 
-LIBADD= util xo
+LIBADD=	xo util
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/bin/ls/Makefile
==============================================================================
--- user/ngie/bug203673/bin/ls/Makefile	Sun Oct 18 01:21:29 2015	(r289478)
+++ user/ngie/bug203673/bin/ls/Makefile	Sun Oct 18 01:30:23 2015	(r289479)
@@ -5,7 +5,7 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-LIBADD=	util xo
+LIBADD=	xo util
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no

Modified: user/ngie/bug203673/libexec/ftpd/Makefile
==============================================================================
--- user/ngie/bug203673/libexec/ftpd/Makefile	Sun Oct 18 01:21:29 2015	(r289478)
+++ user/ngie/bug203673/libexec/ftpd/Makefile	Sun Oct 18 01:30:23 2015	(r289479)
@@ -13,7 +13,7 @@ YFLAGS=
 WARNS?=	2
 WFORMAT=0
 
-LIBADD=	crypt util xo
+LIBADD=	crypt xo util
 
 # XXX Kluge! Conversation mechanism needs to be fixed.
 LIBADD+=	opie md

Modified: user/ngie/bug203673/usr.bin/netstat/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/netstat/Makefile	Sun Oct 18 01:21:29 2015	(r289478)
+++ user/ngie/bug203673/usr.bin/netstat/Makefile	Sun Oct 18 01:30:23 2015	(r289479)
@@ -56,7 +56,7 @@ CFLAGS+=-DPF
 
 BINGRP=	kmem
 BINMODE=2555
-LIBADD=	kvm memstat util xo
+LIBADD=	kvm memstat xo util
 
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SRCS+=	netgraph.c

Modified: user/ngie/bug203673/usr.bin/procstat/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/procstat/Makefile	Sun Oct 18 01:21:29 2015	(r289478)
+++ user/ngie/bug203673/usr.bin/procstat/Makefile	Sun Oct 18 01:30:23 2015	(r289479)
@@ -17,6 +17,6 @@ SRCS=	procstat.c		\
 	procstat_threads.c	\
 	procstat_vm.c
 
-LIBADD+=	procstat util xo sbuf
+LIBADD+=	procstat xo util sbuf
 
 .include <bsd.prog.mk>

Modified: user/ngie/bug203673/usr.bin/w/Makefile
==============================================================================
--- user/ngie/bug203673/usr.bin/w/Makefile	Sun Oct 18 01:21:29 2015	(r289478)
+++ user/ngie/bug203673/usr.bin/w/Makefile	Sun Oct 18 01:30:23 2015	(r289479)
@@ -4,7 +4,7 @@
 PROG=	w
 SRCS=	fmt.c pr_time.c proc_compare.c w.c
 MAN=	w.1 uptime.1
-LIBADD=	kvm sbuf util xo
+LIBADD=	kvm sbuf xo util
 LINKS=	${BINDIR}/w ${BINDIR}/uptime
 
 .PATH: ${.CURDIR}/../../bin/ps