summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Mills <gary_mills@fastmail.fm>2015-05-09 20:34:30 -0500
committerGordon Ross <gwr@nexenta.com>2015-05-15 18:34:49 -0400
commite7619b69689d6a40a07425ef14002f2ab4d724d9 (patch)
tree62e78176d0a74b20397dd0379f0ec63a83e6f2d6
parent2ba6d2b94a398caab9e751c277f0acbd1cc22c77 (diff)
downloadillumos-joyent-e7619b69689d6a40a07425ef14002f2ab4d724d9.tar.gz
5840 cmd/ypcmd build failed without usr/lib/libsocket.so on build host
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com> Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com> Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r--usr/src/cmd/ypcmd/Makefile18
1 files changed, 10 insertions, 8 deletions
diff --git a/usr/src/cmd/ypcmd/Makefile b/usr/src/cmd/ypcmd/Makefile
index ed16123edc..f39194c092 100644
--- a/usr/src/cmd/ypcmd/Makefile
+++ b/usr/src/cmd/ypcmd/Makefile
@@ -19,6 +19,7 @@
# CDDL HEADER END
#
#
+# Copyright 2015 Gary Mills
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -35,6 +36,10 @@ PROG= $(BINPROG) $(SBINPROG) $(NETYPPROG) $(NIS2LDAPPROG) $(SVCMETHOD)
MANIFEST = server.xml client.xml xfr.xml
+# These only need -lnsl
+LNSLPROG = ypmatch ypwhich ypcat yppoll ypset \
+ ypbind ypxfr yppush mkalias stdhosts
+
include ../Makefile.cmd
ROOTMANIFESTDIR = $(ROOTSVCNETWORKNIS)
@@ -49,12 +54,9 @@ ROOTDIRS = $(ROOT) $(ROOTUSR) $(ROOTLIB) $(ROOTETC) $(ROOTVAR) \
$(NETSVC) $(NETYP) $(ROOTVAR_YP) $(ROOTBINDING) \
$(ROOTUSRSBIN) $(ROOTBIN)
-$(BINPROG) := LDLIBS += -lnsl
-$(NETYPPROG) := LDLIBS += -lnsl
+$(LNSLPROG) := LDLIBS += -lnsl
$(NIS2LDAPPROG) := LDLIBS += -lc -lnsl -lnisdb
-ypinit := LDLIBS += -lnsl
-yppoll := LDLIBS += -lnsl
-ypset := LDLIBS += -lnsl
+stdethers := LDLIBS += -lsocket
makedbm := MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
makedbm := LDFLAGS += $(MAPFILES:%=-M%)
@@ -243,15 +245,15 @@ yppush: $(YPPUSHOBJ) $(COMMONOBJ)
$(POST_PROCESS)
udpublickey: $(UDPUBLICKEYOBJ)
- $(LINK.c) $(UDPUBLICKEYOBJ) -o $@
+ $(LINK.c) $(UDPUBLICKEYOBJ) -o $@ $(LDLIBS)
$(POST_PROCESS)
mkalias: $(MKALIASOBJ)
- $(LINK.c) $(MKALIASOBJ) -o $@ -lnsl
+ $(LINK.c) $(MKALIASOBJ) -o $@ $(LDLIBS)
$(POST_PROCESS)
stdethers: $(STDETHERSOBJ)
- $(LINK.c) $(STDETHERSOBJ) -o $@ -lsocket
+ $(LINK.c) $(STDETHERSOBJ) -o $@ $(LDLIBS)
$(POST_PROCESS)
stdhosts: $(STDHOSTSOBJ)