[illumos-gate merge]

commit d50bcaae2118610560f2b107d0d282315e47e4e4
    6492 Several commands/libraries build missing LDLIBS
commit 289f7e33e45aca289f5680be1d8c2df820ba61bc
    690 system/management/snmp/sea/sea-config package should be obsolete

21 files changed, 67 insertions, 70 deletions

diff --git a/usr/src/cmd/abi/appcert/static_prof/Makefile.com b/usr/src/cmd/abi/appcert/static_prof/Makefile.com
index 98d2d4f524..de7b69f031 100644
--- a/usr/src/cmd/abi/appcert/static_prof/Makefile.com
+++ b/usr/src/cmd/abi/appcert/static_prof/Makefile.com
@@ -19,11 +19,12 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright (c) 1997-2000 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/abi/appcert/static_prof/Makefile.com
+# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
 include		$(SRC)/cmd/Makefile.cmd
@@ -31,11 +32,10 @@ include		$(SRC)/cmd/Makefile.cmd
 PROG = static_prof
 SRCS = $(PROG:%=../%.c)
 
-# CPPFLAGS =	-I.. 
-CFLAGS	+=	$(LDLIBS)
 CERRWARN +=	-_gcc=-Wno-unused-value
 CERRWARN +=	-_gcc=-Wno-parentheses
-LDLIBS	=	-lelf
+
+LDLIBS +=	-lelf
 
 LINTFLAGS =	-nmxsuF -errtags=yes
 LINTLIBS +=	$(LDLIBS)
diff --git a/usr/src/cmd/abi/appcert/static_prof/Makefile.targ b/usr/src/cmd/abi/appcert/static_prof/Makefile.targ
index aaf0eb1a09..8e658075ea 100644
--- a/usr/src/cmd/abi/appcert/static_prof/Makefile.targ
+++ b/usr/src/cmd/abi/appcert/static_prof/Makefile.targ
@@ -19,23 +19,22 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright (c) 1997-2000 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/abi/appcert/static_prof/Makefile
+# Copyright 2015 RackTop Systems.
 #
 
 $(PROG): $(SRCS)
-		$(LINK.c) -o $@ $(SRCS)
+		$(LINK.c) -o $@ $(SRCS) $(LDLIBS)
 		$(POST_PROCESS)
 
 #
 # clean - (apparently needs an explicit directive)
 #
-clean:	
+clean:
 	-$(RM) $(PROG)
 
 #
diff --git a/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ b/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ
index 2ff10bcdaa..35fbdb839d 100644
--- a/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ
+++ b/usr/src/cmd/abi/spectrans/spec2trace/Makefile.targ
@@ -19,10 +19,13 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright (c) 1997-1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
+# Copyright 2015 Nexenta Systems, Inc.  All right reserved.
+#
 
 .KEEP_STATE:
 
@@ -46,8 +49,3 @@ CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-switch
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-unused-label
-
-parseproto := RM = @echo keeping	# do not remove generated C code
-parseproto := COPTFLAG = -g -DDEBUG -DMEM_DEBUG -DTRACE
-parseproto:	parseproto.o
-	$(LINK.c) -o parseproto parseproto.o
diff --git a/usr/src/cmd/adbgen/Makefile.com b/usr/src/cmd/adbgen/Makefile.com
index 16e859da99..17afe7784a 100644
--- a/usr/src/cmd/adbgen/Makefile.com
+++ b/usr/src/cmd/adbgen/Makefile.com
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2015 RackTop Systems.
 #
 
 PROGS = adbgen1 adbgen3 adbgen4
@@ -54,7 +54,7 @@ install: $$(ROOTPROGS) $$(ROOTOBJS) $$(ROOTSCRIPTS)
 clean:
 
 adbgen%: ../common/adbgen%.c
-	$(LINK.c) -o $@ $<
+	$(LINK.c) -o $@ $< $(LDLIBS)
 	$(POST_PROCESS)
 
 %.o: ../common/%.c
diff --git a/usr/src/cmd/audio/audiotest/Makefile b/usr/src/cmd/audio/audiotest/Makefile
index 043b9eb2b8..789e9944bd 100644
--- a/usr/src/cmd/audio/audiotest/Makefile
+++ b/usr/src/cmd/audio/audiotest/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2015 RackTop Systems.
+#
 # Makefile for cmd/audio/audiotest
 
 PROG= audiotest
@@ -38,7 +40,7 @@ XGETFLAGS += -a -x audiotest.xcl
 all: $(PROG)
 
 $(PROG):	$(OBJS)
-	$(LINK.c) $(OBJS) -o $@
+	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(ROOTPROG)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/nca/Makefile b/usr/src/cmd/cmd-inet/usr.bin/nca/Makefile
index d993fb7ec5..88bae6de1c 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/nca/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/nca/Makefile
@@ -22,6 +22,8 @@
 #
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+#
+# Copyright 2015 RackTop Systems.
 # 
 
 PROG=	ncab2clf 
@@ -55,7 +57,7 @@ CPPFLAGS +=	-I$(INC_PATH)
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@
+	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
 #
diff --git a/usr/src/cmd/dtrace/test/tst/common/Makefile b/usr/src/cmd/dtrace/test/tst/common/Makefile
index 95ada26513..32d6a1db05 100644
--- a/usr/src/cmd/dtrace/test/tst/common/Makefile
+++ b/usr/src/cmd/dtrace/test/tst/common/Makefile
@@ -27,6 +27,7 @@
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright (c) 2013, Joyent, Inc. All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
 #
@@ -75,7 +76,7 @@ nfs/tst.call3.exe: nfs/tst.call3.o nfs/$(RPCSVCOBJS)
 	$(POST_PROCESS) ; $(STRIP_STABS)
 
 pid/tst.gcc.exe: pid/tst.gcc.c
-	$(GCC) -o pid/tst.gcc.exe pid/tst.gcc.c $(LDFLAGS)
+	$(GCC) -o pid/tst.gcc.exe pid/tst.gcc.c $(LDFLAGS) $(LDLIBS)
 	$(POST_PROCESS) ; $(STRIP_STABS)
 
 json/tst.usdt.o: json/usdt.h
diff --git a/usr/src/cmd/fm/fmd/Makefile.fmd b/usr/src/cmd/fm/fmd/Makefile.fmd
index 67182fa4d1..3634df1269 100644
--- a/usr/src/cmd/fm/fmd/Makefile.fmd
+++ b/usr/src/cmd/fm/fmd/Makefile.fmd
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 RackTop Systems.
 #
 
 .KEEP_STATE:
@@ -160,7 +161,7 @@ $(PROG): $(OBJS)
 	$(POST_PROCESS)
 
 $(DMOD): $(DMOD_OBJS)
-	$(LINK.c) $(DMOD_OBJS) -o $@ -lc
+	$(LINK.c) $(DMOD_OBJS) -o $@ $(LDLIBS) -lc
 	$(POST_PROCESS)
 
 %.o: ../common/%.c
diff --git a/usr/src/cmd/fm/modules/Makefile.plugin b/usr/src/cmd/fm/modules/Makefile.plugin
index a8a0f00c83..c944c922b9 100644
--- a/usr/src/cmd/fm/modules/Makefile.plugin
+++ b/usr/src/cmd/fm/modules/Makefile.plugin
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 RackTop Systems.
 #
 
 .KEEP_STATE:
@@ -100,7 +101,7 @@ $(PROG): $(OBJS) $(APIMAP)
 
 $(DMODPROG): $(DMOD_OBJS) $(MAPFILE-DMOD)
 	-@mkdir -p $(@D)
-	$(LINK.c) $(DMOD_OBJS) $(MAPFILE-DMOD:%=-M%) -o $@ -lc
+	$(LINK.c) $(DMOD_OBJS) $(MAPFILE-DMOD:%=-M%) -o $@ $(LDLIBS) -lc
 	$(POST_PROCESS)
 
 %.o: %.c
diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile
index 4326e1c1a3..5fd524a0f8 100644
--- a/usr/src/cmd/fs.d/autofs/Makefile
+++ b/usr/src/cmd/fs.d/autofs/Makefile
@@ -18,9 +18,11 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 RackTop Systems.
 #
-# cmd/fs.d/autofs/Makefile
 
 FSTYPE=		autofs
 AUTO=		automount
@@ -125,11 +127,11 @@ $(TYPEPROG):	webnfs.h $(TYPEOBJS)
 		$(POST_PROCESS)
 
 $(SHARE):	$(SHAREOBJS)
-		$(LINK.c) -o $@ $(SHAREOBJS)
+		$(LINK.c) -o $@ $(SHAREOBJS) $(LDLIBS)
 		$(POST_PROCESS)
 
 $(UNSHARE):	$(UNSHAREOBJS)
-		$(LINK.c) -o $@ $(UNSHAREOBJS)
+		$(LINK.c) -o $@ $(UNSHAREOBJS) $(LDLIBS)
 		$(POST_PROCESS)
 
 $(ROOTSVCSYSTEM)/filesystem/%: %
diff --git a/usr/src/cmd/link/Makefile b/usr/src/cmd/link/Makefile
index d9f3e9f5d1..f8c8eaaa95 100644
--- a/usr/src/cmd/link/Makefile
+++ b/usr/src/cmd/link/Makefile
@@ -23,6 +23,8 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2015 RackTop Systems.
+#
 
 PROG= link 
 XPG4PROG= link
@@ -41,7 +43,7 @@ CERRWARN += -_gcc=-Wno-parentheses
 all: $(PROG) $(XPG4)
 
 $(PROG) $(XPG4): $$(OBJS)
-	$(LINK.c) -o $@ $(OBJS)
+	$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(ROOTUSRSBINPROG) $(ROOTXPG4PROG)
diff --git a/usr/src/cmd/picl/plugins/common/devtree/Makefile b/usr/src/cmd/picl/plugins/common/devtree/Makefile
index 808061d0ed..b7a7eacc51 100644
--- a/usr/src/cmd/picl/plugins/common/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/common/devtree/Makefile
@@ -19,14 +19,14 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/picl/plugins/common/devtree/Makefile
+# Copyright 2015 RackTop Systems.
 #
+
 LIBRARY=	libpicldevtree.a
 VERS=		.1
 
@@ -97,7 +97,7 @@ lint :
 	$(LINT.c) $(SRCS)
 
 %.so: %.o
-	$(LINK.c) -o $@ $(GSHARED) -h $@ $<
+	$(LINK.c) -o $@ $(GSHARED) -h $@ $< $(LDLIBS)
 
 %.o: %.c
 	$(COMPILE.c) -o $@ $<
diff --git a/usr/src/cmd/rexd/Makefile b/usr/src/cmd/rexd/Makefile
index 986f823620..e237e30430 100644
--- a/usr/src/cmd/rexd/Makefile
+++ b/usr/src/cmd/rexd/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2015 RackTop Systems.
+#
 
 PROG=		rpc.rexd on
 # where under
@@ -112,7 +114,7 @@ include ../Makefile.targ
 #rex_xdr.o \
 #rex_svc.o \
 #rex_clnt.o:	rex.h rex.c
-#	$(LINK.c) -c -o $@ rex.c
+#	$(LINK.c) -c -o $@ rex.c $(LDLIBS)
 
 on.o:		rex.h
 
diff --git a/usr/src/cmd/sgs/link_audit/Makefile.targ b/usr/src/cmd/sgs/link_audit/Makefile.targ
index 497be808a8..42dff453be 100644
--- a/usr/src/cmd/sgs/link_audit/Makefile.targ
+++ b/usr/src/cmd/sgs/link_audit/Makefile.targ
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2015 RackTop Systems.
 #
 
 %:	../common/%.ksh
@@ -67,7 +67,7 @@ $(WHOLIB): $(WHOPICS)
 		$(POST_PROCESS_SO)
 
 dumpbind: $(OBJDIR)/dumpbind.o
-		$(LINK.c) -o $@ $(OBJDIR)/dumpbind.o
+		$(LINK.c) -o $@ $(OBJDIR)/dumpbind.o $(LDLIBS)
 		$(POST_PROCESS)
 
 $(ROOTUSRBIN)/%: %
diff --git a/usr/src/cmd/sgs/link_audit/common/Makefile.demo b/usr/src/cmd/sgs/link_audit/common/Makefile.demo
index 2607142cfd..528c2283e8 100644
--- a/usr/src/cmd/sgs/link_audit/common/Makefile.demo
+++ b/usr/src/cmd/sgs/link_audit/common/Makefile.demo
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 RackTop Systems.
 #
 
 MACH:sh=	uname -p
@@ -74,7 +75,7 @@ obj64/%.o: src/%.c
 
 dumpbind: \
 	obj32/dumpbind.o
-	$(LINK.c) obj32/dumpbind.o -o $@
+	$(LINK.c) obj32/dumpbind.o -o $@ $(LDLIBS)
 
 lib32/bindings.so.1: \
 	obj32/bindings.o obj32/env.o
diff --git a/usr/src/cmd/vt/Makefile b/usr/src/cmd/vt/Makefile
index 48fa393153..daae42bee4 100644
--- a/usr/src/cmd/vt/Makefile
+++ b/usr/src/cmd/vt/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2015 RackTop Systems.
+#
 
 PROG= vtdaemon vtinfo vtxlock
 
@@ -33,7 +35,8 @@ include ../Makefile.cmd
 CFLAGS += $(CCVERBOSE)
 CERRWARN += -_gcc=-Wno-uninitialized
 
-LDLIBS += -lpam -lbsm
+vtdaemon := LDLIBS += -lpam -lbsm
+lint_vtdaemon := LDLIBS += -lpam -lbsm
 
 .KEEP_STATE:
 
@@ -44,15 +47,19 @@ vtdaemon: $(VTDAEMON_SRC)
 	$(POST_PROCESS)
 
 vtinfo: $(VTINFO_SRC)
-	$(LINK.c) -o $@ $(VTINFO_SRC)
+	$(LINK.c) -o $@ $(VTINFO_SRC) $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(ROOTLIBPROG)
 
 clean:
 
-lint:
+lint: lint_vtdaemon lint_vtinfo
+
+lint_vtdaemon:
 	$(LINT.c) $(VTDAEMON_SRC) $(LDLIBS)
-	$(LINT.c) $(VTINFO_SRC)
+
+lint_vtinfo:
+	$(LINT.c) $(VTINFO_SRC) $(LDLIBS)
 
 include ../Makefile.targ
diff --git a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ
index 69a1ce2a30..edeaa039e3 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ
+++ b/usr/src/lib/scsi/plugins/scsi/engines/Makefile.targ
@@ -23,7 +23,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2015 RackTop Systems.
+#
 
 all: $(PROG) $(DMODPROG)
 
@@ -37,7 +38,7 @@ $(PROG): $(OBJS) $(APIMAP)
 
 $(DMODPROG): $(DMOD_OBJS)
 	-@mkdir -p $(@D)
-	$(LINK.c) $(DMOD_OBJS) -o $@
+	$(LINK.c) $(DMOD_OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
 %.o: %.c
diff --git a/usr/src/lib/scsi/plugins/ses/Makefile.targ b/usr/src/lib/scsi/plugins/ses/Makefile.targ
index 269e91c34b..1753da2da4 100644
--- a/usr/src/lib/scsi/plugins/ses/Makefile.targ
+++ b/usr/src/lib/scsi/plugins/ses/Makefile.targ
@@ -23,7 +23,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2015 RackTop Systems.
+#
 
 all: $(PROG) $(DMODPROG)
 
@@ -37,7 +38,7 @@ $(PROG): $(OBJS) $(APIMAP)
 
 $(DMODPROG): $(DMOD_OBJS)
 	-@mkdir -p $(@D)
-	$(LINK.c) $(DMOD_OBJS) -o $@
+	$(LINK.c) $(DMOD_OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
 %.o: %.c
diff --git a/usr/src/lib/scsi/plugins/smp/Makefile.targ b/usr/src/lib/scsi/plugins/smp/Makefile.targ
index 5aee626e08..450fbd9562 100644
--- a/usr/src/lib/scsi/plugins/smp/Makefile.targ
+++ b/usr/src/lib/scsi/plugins/smp/Makefile.targ
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 RackTop Systems.
 #
 
 all: $(PROG) $(DMODPROG)
@@ -35,7 +36,7 @@ $(PROG): $(OBJS) $(APIMAP)
 
 $(DMODPROG): $(DMOD_OBJS)
 	-@mkdir -p $(@D)
-	$(LINK.c) $(DMOD_OBJS) -o $@
+	$(LINK.c) $(DMOD_OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
 %.o: %.c
diff --git a/usr/src/pkg/manifests/SUNWsacom.mf b/usr/src/pkg/manifests/SUNWsacom.mf
index 0ca33ce331..f333ee95a7 100644
--- a/usr/src/pkg/manifests/SUNWsacom.mf
+++ b/usr/src/pkg/manifests/SUNWsacom.mf
@@ -21,10 +21,9 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/SUNWsacom@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/management/snmp/sea/sea-config@0.5.11,5.11-0.133 \
-    type=require
diff --git a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf
index b8d5a928d4..13814ec9b3 100644
--- a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf
+++ b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf
@@ -21,32 +21,9 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
 #
 
-#
-# This package is left in place solely to satisfy a dependency from
-# the SFW net-snmp package.  There is an argument to be made that the
-# dependency is actually "soft".  That is, that the net-snmp doesn't
-# really *need* the files that were formerly delivered by this
-# package.  Unfortunately, the packaging system doesn't realize this
-# and would refuse to install net-snmp, which would create problems
-# for FMA, if this package doesn't exist.
-#
-# There may be some fallout from this delivery for now, until the
-# net-snmp package is updated to remove the SEA hacks that Sun had
-# originally added to it.  For now it just deliveres a (duplicate)
-# reference to /etc.
-#
-# Once that is done, this package can be obsoleted.  Note that the
-# previous package, named SUNWsacom, would need to be removed at the
-# same time.
-#
 set name=pkg.fmri value=pkg:/system/management/snmp/sea/sea-config@$(PKGVERS)
-set name=pkg.description \
-    value="Solstice Enterprise Agents 1.0.3 files for root file system"
-set name=pkg.summary \
-    value="Solstice Enterprise Agents 1.0.3 files for root file system"
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir path=etc group=sys