summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr/src/cmd/cmd-inet/lib/nwamd/Makefile4
-rw-r--r--usr/src/cmd/devfsadm/Makefile.com20
-rw-r--r--usr/src/cmd/devfsadm/mapfile-vers64
-rw-r--r--usr/src/cmd/fps/fpsd/Makefile4
-rw-r--r--usr/src/cmd/fs.d/autofs/Makefile4
-rw-r--r--usr/src/cmd/fs.d/nfs/mountd/Makefile4
-rw-r--r--usr/src/cmd/fs.d/nfs/nfsmapid/Makefile6
-rw-r--r--usr/src/cmd/fs.d/smbclnt/smbiod/Makefile2
-rw-r--r--usr/src/cmd/iscsi/iscsitgtd/Makefile.com2
-rw-r--r--usr/src/cmd/iscsid/Makefile2
-rw-r--r--usr/src/cmd/isns/isnsadm/Makefile4
-rw-r--r--usr/src/cmd/isns/isnsd/Makefile2
-rw-r--r--usr/src/cmd/svc/configd/Makefile3
-rw-r--r--usr/src/cmd/svc/svccfg/Makefile4
-rw-r--r--usr/src/cmd/vt/Makefile4
-rw-r--r--usr/src/cmd/wusbadm/Makefile2
-rw-r--r--usr/src/lib/libnwam/Makefile.com4
-rw-r--r--usr/src/lib/libscf/Makefile.com3
-rw-r--r--usr/src/tools/scripts/check_rtime.pl12
19 files changed, 111 insertions, 39 deletions
diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
index de5fcbe951..02c930618d 100644
--- a/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
+++ b/usr/src/cmd/cmd-inet/lib/nwamd/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# usr/src/cmd/cmd-inet/lib/nwamd/Makefile
@@ -43,7 +43,7 @@ POFILES= interface.po wireless.po
ROOTCMDDIR= $(ROOTFS_LIBDIR)/inet
LDLIBS += -lsocket -lnsl -linetcfg -linetutil -lumem -lscf -ldladm \
- -lgen -ldoor -lsecdb -lbsm -lsysevent -lnvpair
+ -lgen -lsecdb -lbsm -lsysevent -lnvpair
.KEEP_STATE:
diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com
index 8948513136..3468647dd5 100644
--- a/usr/src/cmd/devfsadm/Makefile.com
+++ b/usr/src/cmd/devfsadm/Makefile.com
@@ -22,6 +22,11 @@
# Use is subject to license terms.
#
+# This target builds both a command (daemon) and various shared objects. This
+# isn't a typical target, and the inclusion of both library and command
+# Makefiles were probably not in their original design. However, there doesn't
+# presently seem to be a clash of any required definitions.
+include ../../../lib/Makefile.lib
include ../../Makefile.cmd
COMMON = ..
@@ -90,10 +95,15 @@ LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
-LDLIBS += -ldevinfo -lgen -lsysevent -lnvpair -ldoor -lzonecfg -lbsm
+# Define the dependencies required by devfsadm and all shared objects.
+LDLIBS += -ldevinfo
+devfsadm := LDLIBS += -lgen -lsysevent -lnvpair -lzonecfg -lbsm
+SUNW_md_link.so := LDLIBS += -lmeta
-LINK_MOD_LDLIBS=
-SUNW_md_link.so := LINK_MOD_LDLIBS= -lmeta
+# All libraries are built from the same SUNW_%.so rule (see below), and define
+# their own SONAME using -h explicitly. Null the generic -h macro that gets
+# inherited from Makefile.lib, otherwise we'll get two -h definitions.
+HSONAME =
SRCS = $(DEVFSADM_SRC) $(LINK_SRCS)
OBJS = $(DEVFSADM_OBJ) $(LINK_OBJS)
@@ -164,8 +174,8 @@ $(DEVFSADM_MOD): $(DEVFSADM_OBJ)
$(LINK.c) -o $@ $< $(DEVFSADM_OBJ) $(LDLIBS)
$(POST_PROCESS)
-SUNW_%.so: %.o
- $(LINK.c) -o $@ $(GSHARED) -h $@ $< $(LINK_MOD_LDLIBS)
+SUNW_%.so: %.o $(MAPFILES)
+ $(CC) -o $@ $(GSHARED) $(DYNFLAGS) -h $@ $< $(LDLIBS) -lc
$(POST_PROCESS_SO)
%.o: $(COMMON)/%.c
diff --git a/usr/src/cmd/devfsadm/mapfile-vers b/usr/src/cmd/devfsadm/mapfile-vers
new file mode 100644
index 0000000000..10a815f3ca
--- /dev/null
+++ b/usr/src/cmd/devfsadm/mapfile-vers
@@ -0,0 +1,64 @@
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING: STOP NOW. DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+# usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
+#
+
+# External interface requirements
+{
+ global:
+ devfsadm_devlink_cache = EXTERN;
+ devfsadm_enumerate_char_start = EXTERN;
+ devfsadm_enumerate_int = EXTERN;
+ devfsadm_errprint = EXTERN;
+ devfsadm_free_dev_names = EXTERN;
+ devfsadm_have_reserved = EXTERN;
+ devfsadm_is_reserved = EXTERN;
+ devfsadm_link_valid = EXTERN;
+ devfsadm_lookup_dev_names = EXTERN;
+ devfsadm_mklink = EXTERN;
+ devfsadm_noupdate = EXTERN;
+ devfsadm_print = EXTERN;
+ devfsadm_read_link = EXTERN;
+ devfsadm_reserve_id_cache = EXTERN;
+ devfsadm_rm_all = EXTERN;
+ devfsadm_rm_link = EXTERN;
+ devfsadm_rm_stale_links = EXTERN;
+ devfsadm_root_path = EXTERN;
+ devfsadm_secondary_link = EXTERN;
+ disk_enumerate_int = EXTERN;
+ s_strdup = EXTERN;
+ system_labeled = EXTERN;
+};
diff --git a/usr/src/cmd/fps/fpsd/Makefile b/usr/src/cmd/fps/fpsd/Makefile
index 8c7d7ccf74..5c30d5f9a0 100644
--- a/usr/src/cmd/fps/fpsd/Makefile
+++ b/usr/src/cmd/fps/fpsd/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -44,7 +44,7 @@ CPPFLAGS += -I../include -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
CFLAGS += $(CCMT)
-LDLIBS += -lc -ldevinfo -ldoor -lkstat -lscf -lgen
+LDLIBS += -lc -ldevinfo -lkstat -lscf -lgen
LDFLAGS += $(ZIGNORE)
diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile
index ab938ead53..525f447e57 100644
--- a/usr/src/cmd/fs.d/autofs/Makefile
+++ b/usr/src/cmd/fs.d/autofs/Makefile
@@ -82,9 +82,9 @@ POFILE= autofs.po
GREP= egrep
SED= sed
-$(AUTO) := LDLIBS += -lnsl -lsldap -ldoor
+$(AUTO) := LDLIBS += -lnsl -lsldap
$(MOUNT):= LDLIBS += -lnsl
-$(TYPEPROG) := LDLIBS += -lrpcsvc -lsocket -lnsl -lsldap -lkstat -ldoor
+$(TYPEPROG) := LDLIBS += -lrpcsvc -lsocket -lnsl -lsldap -lkstat
CFLAGS += $(CCVERBOSE) -D_FILE_OFFSET_BITS=64
CPPFLAGS= -I. -I.. -I../nfs/lib $(CPPFLAGS.master) -D_REENTRANT \
diff --git a/usr/src/cmd/fs.d/nfs/mountd/Makefile b/usr/src/cmd/fs.d/nfs/mountd/Makefile
index 04bd608608..c3778f0228 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -35,7 +35,7 @@ LOCAL = mountd.o netgroup.o rmtab.o nfsauth.o \
OBJS = $(LOCAL) $(COMMON)
SRCS = $(LOCAL:%.o=%.c) $(FSLIBSRC) ../lib/nfs_sec.c \
../lib/sharetab.c ../lib/daemon.c
-LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ldoor -ltsnet -ltsol
+LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ltsnet -ltsol
CPPFLAGS += -D_REENTRANT
$(TYPEPROG): $(OBJS)
diff --git a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
index 7ffb2b5722..3a7cf93211 100644
--- a/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsmapid/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
FSTYPE = nfs
TYPEPROG = nfsmapid
@@ -33,7 +31,7 @@ ATTMK = $(TYPEPROG)
include ../../Makefile.fstype
LDLIBS += -L$(ROOT)/usr/lib/nfs -R/usr/lib/nfs
-LDLIBS += -lnsl -lmapid -ldoor -ldtrace -lidmap
+LDLIBS += -lnsl -lmapid -ldtrace -lidmap
SRCS = nfsmapid.c nfsmapid_server.c
DSRC = nfsmapid_dt.d
DOBJ = $(DSRC:%.d=%.o)
diff --git a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
index 626304a88a..40f531f3e7 100644
--- a/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
+++ b/usr/src/cmd/fs.d/smbclnt/smbiod/Makefile
@@ -44,7 +44,7 @@ C99MODE= $(C99_ENABLE)
# This is a multi-thread program but Nevada
# no longer needs -lthread
-LDLIBS += -lsmbfs -ldoor
+LDLIBS += -lsmbfs
CPPFLAGS += -I$(SRC)/lib/libsmbfs \
-I$(SRC)/uts/common/smbclnt -I$(SRC)/uts/common
diff --git a/usr/src/cmd/iscsi/iscsitgtd/Makefile.com b/usr/src/cmd/iscsi/iscsitgtd/Makefile.com
index 213cd89990..da6281ccb1 100644
--- a/usr/src/cmd/iscsi/iscsitgtd/Makefile.com
+++ b/usr/src/cmd/iscsi/iscsitgtd/Makefile.com
@@ -56,7 +56,7 @@ CLEANFILES += $(OBJS) ../$(DTRACE_HEADER)
all: $(PROG)
-LDLIBS += -lumem -luuid -lsocket -lnsl -ldoor -lavl -lmd5 -ladm -lefi
+LDLIBS += -lumem -luuid -lsocket -lnsl -lavl -lmd5 -ladm -lefi
LDLIBS += -liscsitgt -lzfs -ldlpi -lscf -lsasl
XMLLIB = -lxml2
diff --git a/usr/src/cmd/iscsid/Makefile b/usr/src/cmd/iscsid/Makefile
index acd166d9a5..92383a476b 100644
--- a/usr/src/cmd/iscsid/Makefile
+++ b/usr/src/cmd/iscsid/Makefile
@@ -40,7 +40,7 @@ POFILE= iscsi-initiator.po
include ../Makefile.cmd
CCVERBOSE =
-LDLIBS += -ldoor -lnsl
+LDLIBS += -lnsl
ROOTMANIFESTDIR= $(ROOTSVCNETWORKISCSI)
$(ROOTSVCNETWORKISCSI)/iscsi-initiator.xml := FILEMODE = 0444
diff --git a/usr/src/cmd/isns/isnsadm/Makefile b/usr/src/cmd/isns/isnsadm/Makefile
index 6193909127..f3dc5d53fa 100644
--- a/usr/src/cmd/isns/isnsadm/Makefile
+++ b/usr/src/cmd/isns/isnsadm/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -29,7 +29,7 @@ OBJS = $(SRCS:%.c=%.o)
include ../../Makefile.cmd
-LDLIBS += -lxml2 -ldoor -lscf -lc
+LDLIBS += -lxml2 -lscf -lc
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I. -I/usr/include/libxml2 -I../isnsd
POFILE = isnsadm_all.po
diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile
index 48e642284a..49eada657b 100644
--- a/usr/src/cmd/isns/isnsd/Makefile
+++ b/usr/src/cmd/isns/isnsd/Makefile
@@ -57,7 +57,7 @@ LINTFLAGS += -xerroff=E_CASE_FALLTHRU
obj.o := CERRWARN += -erroff=E_CONST_OBJ_SHOULD_HAVE_INITIZR
obj.o := CERRWARN += -erroff=E_IMPLICIT_DECL_FUNC_RETURN_INT
-LDLIBS += -lsecdb -lsocket -lnsl -lscf -lxml2 -ldoor
+LDLIBS += -lsecdb -lsocket -lnsl -lscf -lxml2
.KEEP_STATE:
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile
index 849bc9eb19..1633687fe9 100644
--- a/usr/src/cmd/svc/configd/Makefile
+++ b/usr/src/cmd/svc/configd/Makefile
@@ -69,8 +69,7 @@ $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
$(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
$(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
$(NATIVE_BUILD)LDFLAGS =
-$(NATIVE_BUILD)LDLIBS = -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \
- $(MYLDLIBS) -ldoor
+$(NATIVE_BUILD)LDLIBS = -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
DIRMODE = 0755
FILEMODE = 0555
diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile
index 5cdb524581..5f0925d3e4 100644
--- a/usr/src/cmd/svc/svccfg/Makefile
+++ b/usr/src/cmd/svc/svccfg/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -103,7 +103,7 @@ $(NATIVE_BUILD)LDFLAGS =
$(NATIVE_BUILD)LDLIBS = \
-L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \
-L$(LIBSCF)/native -R $(LIBSCF)/native \
- $(SVCCFG_EXTRA_LIBS) -ldoor
+ $(SVCCFG_EXTRA_LIBS)
svccfg_lex.o svccfg_grammar.o := CCVERBOSE =
diff --git a/usr/src/cmd/vt/Makefile b/usr/src/cmd/vt/Makefile
index 432e832888..b7a1c63cdd 100644
--- a/usr/src/cmd/vt/Makefile
+++ b/usr/src/cmd/vt/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -32,7 +32,7 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
-LDLIBS += -ldoor -lpam -lbsm
+LDLIBS += -lpam -lbsm
.KEEP_STATE:
diff --git a/usr/src/cmd/wusbadm/Makefile b/usr/src/cmd/wusbadm/Makefile
index d77180bd52..b01e042b12 100644
--- a/usr/src/cmd/wusbadm/Makefile
+++ b/usr/src/cmd/wusbadm/Makefile
@@ -39,7 +39,7 @@ POFILES=$(OBJS:%.o=%.po)
CPPFLAGS += -I$(SRC)/uts/common
-LDLIBS += -lpkcs11 -lkmf -ldoor -lsysevent -lnvpair -lsecdb
+LDLIBS += -lpkcs11 -lkmf -lsysevent -lnvpair -lsecdb
.KEEP_STATE:
diff --git a/usr/src/lib/libnwam/Makefile.com b/usr/src/lib/libnwam/Makefile.com
index 8ef4d2ba07..f05345922d 100644
--- a/usr/src/lib/libnwam/Makefile.com
+++ b/usr/src/lib/libnwam/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -38,7 +38,7 @@ SRCS = $(OBJECTS:%.o=$(SRCDIR)/%.c)
$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
-LDLIBS += -ldoor -ldladm -lc
+LDLIBS += -ldladm -lc
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRCDIR) -I$(NWAMDIR)
diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com
index 95c522cb2a..b2f3589247 100644
--- a/usr/src/lib/libscf/Makefile.com
+++ b/usr/src/lib/libscf/Makefile.com
@@ -64,8 +64,7 @@ LIBUUTIL = $(SRC)/lib/libuutil
MY_NATIVE_CPPFLAGS =\
-DNATIVE_BUILD $(DTEXTDOM) \
-I../inc -I$(COMDIR) -I$(LIBUUTIL)/common -I$(ROOTHDRDIR)
-MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native -luutil -ldoor \
- -lc -lgen
+MY_NATIVE_LDLIBS = -L$(LIBUUTIL)/native -R$(LIBUUTIL)/native -luutil -lc -lgen
MY_NATIVE_LDLIBS_i386 = -lsmbios
MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH))
diff --git a/usr/src/tools/scripts/check_rtime.pl b/usr/src/tools/scripts/check_rtime.pl
index a5f8ab7d70..b14f899d40 100644
--- a/usr/src/tools/scripts/check_rtime.pl
+++ b/usr/src/tools/scripts/check_rtime.pl
@@ -71,7 +71,6 @@ use strict;
# Define any directories we should skip completely.
$SkipDirs = qr{
- usr/lib/devfsadm | # 4382889
usr/lib/libc | # optimized libc
usr/lib/rcm | # 4426119
usr/perl5 | # alan's taking care of these :-)
@@ -229,15 +228,18 @@ $SkipInterps = qr{
# Catch libintl and libw, although ld(1) will bind to these and thus determine
# they're needed, their content was moved into libc as of on297 build 7.
-# libthread and libpthread were completely moved into libc as of on10 build 53.
-# libdl was moved into libc as of on10 build 49. librt and libaio were moved
-# into libc as of Nevada build 44.
+# libsched was moved into libc as of on10 build 36. libdl was moved into libc
+# as of on10 build 49. libthread and libpthread were into libc as of on10 build
+# 53. libdoor was moved into libc as of Nevada build 12. librt and libaio were
+# moved into libc in Nevada build 44.
$OldDeps = qr{ ^(?:
libintl\.so\.1 |
libw\.so\.1 |
+ libsched\.so\.1 |
+ libdl\.so\.1 |
libthread\.so\.1 |
libpthread\.so\.1 |
- libdl\.so\.1 |
+ libdoor\.so\.1 |
librt\.so\.1 |
libaio\.so\.1
)$
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-05 03:21:47 +0000