diff options
| author | Toomas Soome <tsoome@me.com> | 2020-01-17 09:49:43 -0800 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-02-05 19:00:00 +0200 |
| commit | 5801b0f01c3c34499a929ed96164a5a68b470945 (patch) | |
| tree | 50e06e6f9eb27ea820f4f4e711c485499aad6e86 /usr/src/lib | |
| parent | 948761701ebc8a0cf820a973780b2fbb931c4390 (diff) | |
| download | illumos-gate-5801b0f01c3c34499a929ed96164a5a68b470945.tar.gz | |
12217 add ld assert-deflib and guidance to gate build
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib')
43 files changed, 88 insertions, 173 deletions
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index b6697c6f61..f361ae3d8b 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -572,13 +572,14 @@ dbusdeps: libsecdb libtsol libinetutil libscf libuutil libgen libsmbios # The following dependencies don't need to be listed below as they are built # before everything else: # libc libm libmd libmp libnsl libnvpair libsocket +../cmd/sendmail/libmilter: libsocket libnsl abi: libctf libmapmalloc libproc auditd_plugins: libbsm libsecdb libgss libmtmalloc brand: libzonecfg libmapmalloc cfgadm_plugins: libdevice libdevinfo libhotplug librcm hbaapi libkstat libscf fm: libexacct libipmi libzfs scsi libdevinfo libdevid libcfgadm \ libcontract libsysevent ../cmd/sgs/libelf libdladm libsff \ - libpcidb + libpcidb libdiskmgt $(SPARC_BLD)fm: libpri gss_mechs/mech_dh: libgss gss_mechs/mech_dummy: libgss @@ -586,17 +587,20 @@ gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat gss_mechs/mech_spnego: gss_mechs/mech_krb5 hal: dbusdeps krb5: gss_mechs/mech_krb5 libtecla libldap5 +libads: libnsl libadt_jni: libbsm libadutils: libldap5 libresolv2 libbe: libzfs libinstzones libuuid libgen libdevinfo libefi libficl libbsm: libinetutil libscf libsecdb libtsol libcfgadm: libdevinfo +libcontract: libnvpair libcmd: libsum libast -libcmdutils: libavl +libcmdutils: libavl libnvpair libcpc: libpctx libcrypt: libgen libctf: libdwarf libdemangle: libcustr +libdevice: libnvpair libdevid: libdevinfo libdevinfo: libsec libgen libdhcpagent: libdhcputil libuuid libdlpi libcontract @@ -610,6 +614,7 @@ libdlpi: libinetutil libdladm libds: libsysevent libdtrace: libproc libgen libctf libmapmalloc libdtrace_jni: libuutil libdtrace +libdwarf: ../cmd/sgs/libelf libefi: libuuid libsmbios libelfsign: libcryptoutil libkmf ../cmd/sgs/libelf libeti: libcurses @@ -623,11 +628,14 @@ libgrubmgmt: libdevinfo libzfs libfstyp libefi $(INTEL_BLD)libgrubmgmt: libfdisk libidmap: libavl libuutil libinetsvc: libscf +libinetutil: libsocket libinstzones: libzonecfg libcontract libipadm: libinetutil libdlpi libdhcpagent libdladm libsecdb libdhcputil +libipmi: libm libnvpair libsocket libnsl libipmp: libinetutil libipsecutil: libtecla libtsol libkmf libiscsit: libstmf libuuid +libhotplug: libnvpair libkmf: libcryptoutil pkcs11 libcustr libkvm: ../cmd/sgs/libelf libldap5: libsasl @@ -644,14 +652,16 @@ libpp: libast libproc: ../cmd/sgs/librtld_db ../cmd/sgs/libelf libctf $(INTEL_BLD)libproc: libsaveargs libproject: libpool libproc libsecdb -libprtdiag: libkstat +libprtdiag: libkstat libdevinfo libprtdiag_psr: libprtdiag libraidcfg: libdevinfo +librcm: libnvpair librestart: libuutil libscf libpool libproject libsecdb libsysevent libsasl: libgss pkcs11 libsaveargs: libdisasm -libscf: libuutil libgen libsmbios +libscf: libuutil libgen libnsl libnvpair libsmbios libsec: libavl libidmap +libsecdb: libnsl libsff: libnvpair libshare: libscf libzfs libuuid libfsmgt libsecdb libumem libsmbfs libshell: libast libcmd libdll libsecdb @@ -678,6 +688,7 @@ libvrrpadm: libdladm libscf libvscan: libscf libsecdb libzfs: libdevid libgen libuutil libadm libavl libefi libidmap \ libumem libtsol libzfs_core libcryptoutil pkcs11 libmd libcmdutils +libzfs_core: libnvpair libzfs_jni: libdiskmgt libzfs libzonecfg: libuuid libsysevent libsec libbrand libpool libscf libproc \ libuutil libbsm libsecdb diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 1471e292c9..d36b608df9 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -127,7 +127,8 @@ SONAME= $(DYNLIB) HSONAME= -h$(SONAME) DYNFLAGS= $(HSONAME) $(ZTEXT) $(ZDEFS) $(BDIRECT) \ - $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) + $(MAPFILES:%=-M%) $(MAPFILE.PGA:%=-M%) $(MAPFILE.NED:%=-M%) \ + $(LDCHECKS) LDLIBS= $(LDLIBS.lib) diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile.com b/usr/src/lib/fm/libfmd_snmp/Makefile.com index e43b2a4152..dc5b046c12 100644 --- a/usr/src/lib/fm/libfmd_snmp/Makefile.com +++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com @@ -40,7 +40,7 @@ include ../../../Makefile.lib include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -51,31 +51,18 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS) CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) -# No lint libraries are delivered for Net-SNMP yet SNMPLIBS = -lnetsnmp -lnetsnmphelpers -lnetsnmpagent -lint := SNMPLIBS= +NATIVE_LIBS += libnetsnmp.so libnetsnmphelpers.so libnetsnmpagent.so LDLIBS += $(MACH_LDLIBS) LDLIBS += -lfmd_adm -luutil -lnvpair -ltopo LDLIBS += $(SNMPLIBS) LDLIBS += -lc -LINTFLAGS = -msux $(C99LMODE) -LINTFLAGS64 = -msux -m64 $(C99LMODE) - -# Net-SNMP's headers use do {} while (0) a lot -LINTCHECKFLAGS += -erroff=E_CONSTANT_CONDITION - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 - .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libldom/Makefile b/usr/src/lib/fm/libldom/Makefile index 970b336f1f..36a5ff1dce 100644 --- a/usr/src/lib/fm/libldom/Makefile +++ b/usr/src/lib/fm/libldom/Makefile @@ -31,18 +31,17 @@ HDRDIR = sparc ROOTFMHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys/fm -SUBDIRS = $(MACH) +SUBDIRS = $(MACH) $(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com index 859a177363..49e9ad5a41 100644 --- a/usr/src/lib/fm/libldom/Makefile.com +++ b/usr/src/lib/fm/libldom/Makefile.com @@ -35,7 +35,7 @@ include ../../Makefile.lib SRCS = $(LIBSRCS:%.c=../sparc/%.c) SRCDIR = ../sparc -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) CPPFLAGS += -I. -I$(SRC)/uts/sun4v -I$(ROOT)/usr/platform/sun4v/include \ -I$(ADJUNCT_PROTO)/usr/include/libxml2 @@ -44,24 +44,15 @@ CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS) CERRWARN += -_gcc=-Wno-parentheses -$(DYNLIB) := LDLIBS += $(MACH_LDLIBS) -$(DYNLIB) := LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc -lxml2 -lsocket \ - -lumem - -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -I$(ROOT)/usr/platform/sun4v/include -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 \ - -I$(ROOT)/usr/platform/sun4v/include +LDLIBS += $(MACH_LDLIBS) +LDLIBS += -lfmd_agent -lnvpair -lscf -lmdesc -lc -lxml2 +LDLIBS += -lsocket -lumem +NATIVE_LIBS += libxml2.so .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/fm/libseslog/common/mapfile-vers b/usr/src/lib/fm/libseslog/common/mapfile-vers index bfd2d7b580..fa603e1a0e 100644 --- a/usr/src/lib/fm/libseslog/common/mapfile-vers +++ b/usr/src/lib/fm/libseslog/common/mapfile-vers @@ -37,7 +37,9 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: access_ses_log; local: diff --git a/usr/src/lib/fm/topo/libtopo/Makefile b/usr/src/lib/fm/topo/libtopo/Makefile index 1990c740d9..556eddfdc4 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile +++ b/usr/src/lib/fm/topo/libtopo/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../../Makefile.lib include ../../Makefile.lib @@ -38,11 +36,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber lint: $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: install_h .WAIT $(SUBDIRS) diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com index d50d99434d..e3b18ffa3a 100644 --- a/usr/src/lib/fm/topo/libtopo/Makefile.com +++ b/usr/src/lib/fm/topo/libtopo/Makefile.com @@ -69,7 +69,7 @@ include ../../../../Makefile.lib include ../../../Makefile.lib SRCS = $(BUILTINSRCS:%.c=../common/%.c) $(LIBSRCS:%.c=../common/%.c) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) SRCDIR = ../common @@ -84,24 +84,15 @@ CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-parentheses -LINTFLAGS = -msux -LINTFLAGS64 = -msux -m64 - $(DYNLIB) := LDLIBS += \ -lnvpair -lelf -lumem -lxml2 -lkstat -luuid -ldevinfo \ -lsmbios -lc -ldevid -lipmi -lscf -lpcidb - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -$(LINTLIB) := LINTFLAGS = -nsvx -$(LINTLIB) := LINTFLAGS64 = -nsvx -m64 -$(LINTLIB) := LDLIBS += -lnvpair -lumem -lc +NATIVE_LIBS += libxml2.so .KEEP_STATE: all: $(LIBS) -lint: $(LINTLIB) lintcheck - pics/%.o: ../$(MACH)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/hal/Makefile.com b/usr/src/lib/hal/Makefile.com index c67f2e60bf..57dff20425 100644 --- a/usr/src/lib/hal/Makefile.com +++ b/usr/src/lib/hal/Makefile.com @@ -43,9 +43,6 @@ CLOBBERFILES += $(LIBPCSRC) # all: -# no lint for 3rd party code -lint: - $(ROOTLIBPCDIR): $(INS.dir) diff --git a/usr/src/lib/hal/libhal-storage/Makefile.com b/usr/src/lib/hal/libhal-storage/Makefile.com index e02f113d22..5a3456eea6 100644 --- a/usr/src/lib/hal/libhal-storage/Makefile.com +++ b/usr/src/lib/hal/libhal-storage/Makefile.com @@ -32,9 +32,9 @@ LIBPCSRC = hal-storage.pc include ../../Makefile.com -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -ldbus-1 -lhal -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +NATIVE_LIBS += libdbus-1.so SRCDIR = ../common @@ -54,8 +54,6 @@ ROOTMAJLINK64 = $(ROOTLIBDIR64)/$(LIBRARY:.a=.so)$(VERS_MAJ) all: $(LIBS) -lint: lintcheck - $(ROOTMAJLINK): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ diff --git a/usr/src/lib/hal/libhal/Makefile.com b/usr/src/lib/hal/libhal/Makefile.com index 48657590c7..ce4d40b37e 100644 --- a/usr/src/lib/hal/libhal/Makefile.com +++ b/usr/src/lib/hal/libhal/Makefile.com @@ -35,9 +35,9 @@ LIBPCSRC = hal.pc include ../../Makefile.com -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -ldbus-1 -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +NATIVE_LIBS += libdbus-1.so SRCDIR = ../common diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com index bfd7f9aef2..99814777f1 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com @@ -56,7 +56,7 @@ POFILES = generic.po INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -I$(SRC)/lib/krb5 \ +CPPFLAGS += -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ -I$(SRC)/lib/gss_mechs/mech_krb5/include \ -I$(SRC)/lib/gss_mechs/mech_krb5/krb5/os \ @@ -74,6 +74,7 @@ SMATCH=off CFLAGS += $(CCVERBOSE) -I.. DYNFLAGS += $(KRUNPATH) $(KMECHLIB) -znodelete LDLIBS += -L $(ROOTLIBDIR) -lcrypto -lc +NATIVE_LIBS += libcrypto.so ROOTLIBDIR= $(ROOT)/usr/lib/krb5/plugins/preauth diff --git a/usr/src/lib/libbrand/Makefile.com b/usr/src/lib/libbrand/Makefile.com index 77443eb600..ed9c811c94 100644 --- a/usr/src/lib/libbrand/Makefile.com +++ b/usr/src/lib/libbrand/Makefile.com @@ -30,11 +30,11 @@ OBJECTS= libbrand.o include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) LDLIBS += -lc -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT $(DYNLIB) := LDLIBS += -lxml2 +NATIVE_LIBS += libxml2.so SRCDIR= ../common @@ -42,8 +42,6 @@ SRCDIR= ../common all: $(LIBS) -lint: lintcheck - install: all include ../../Makefile.targ diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 9c21615994..bc1a7d3516 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1224,10 +1224,11 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules GENASSYM_C = genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.native) \ - -o $@ $(GENASSYM_C) + $(LDFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 59fc331a79..3d1f791b6b 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1302,10 +1302,12 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - -D__EXTENSIONS__ $(CPPFLAGS.native) -o $@ $(GENASSYM_C) + -D__EXTENSIONS__ $(CPPFLAGS.native) $(LDFLAGS.native) \ + -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index e8c8405c42..71be2bb7e2 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -1364,10 +1364,11 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h assym.h := CFLAGS += $(CCGDEBUG) GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - $(CPPFLAGS.native) -o $@ $(GENASSYM_C) + $(CPPFLAGS.native) $(LDFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index 07e2878672..57e794dfc8 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -1281,10 +1281,11 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h assym.h := CFLAGS64 += $(CCGDEBUG) GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) genassym: $(GENASSYM_C) $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - $(CPPFLAGS.native) -o $@ $(GENASSYM_C) + $(CPPFLAGS.native) $(LDFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libdhcputil/Makefile.com b/usr/src/lib/libdhcputil/Makefile.com index c3eaa4cf13..8746877afa 100644 --- a/usr/src/lib/libdhcputil/Makefile.com +++ b/usr/src/lib/libdhcputil/Makefile.com @@ -36,13 +36,12 @@ include ../../Makefile.lib # install this library in the root filesystem include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lgen -linetutil -ldlpi SRCDIR = ../common SRCS = $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(COMOBJS:%.o=$(COMDIR)/%.c) -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -56,8 +55,6 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - pics/%.o: $(COMDIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libdwarf/Makefile b/usr/src/lib/libdwarf/Makefile index e5594b685e..7658ff6565 100644 --- a/usr/src/lib/libdwarf/Makefile +++ b/usr/src/lib/libdwarf/Makefile @@ -22,11 +22,10 @@ all := TARGET = all clean := TARGET = clean clobber := TARGET = clobber install := TARGET = install -lint := TARGET = lint .KEEP_STATE: -all clean clobber : $(SUBDIRS) +all clean clobber: $(SUBDIRS) install: $(SUBDIRS) diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com index 1221e26b0b..ec66e3d9be 100644 --- a/usr/src/lib/libficl/Makefile.com +++ b/usr/src/lib/libficl/Makefile.com @@ -26,8 +26,7 @@ OBJECTS= dictionary.o system.o fileaccess.o float.o double.o prefix.o search.o \ include $(SRC)/lib/Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) - +LIBS= $(DYNLIB) FICLDIR= $(SRC)/common/ficl LZ4= $(SRC)/common/lz4 CSTD= $(CSTD_GNU99) @@ -43,6 +42,7 @@ CFLAGS64 += $(C_BIGPICFLAGS64) pics/vm.o := CERRWARN += -_gcc=-Wno-clobbered LDLIBS += -luuid -lz -lc -lm -lumem +NATIVE_LIBS += libz.so HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficltokens.h ../ficllocal.h \ $(FICLDIR)/ficlplatform/unix.h $(PNGLITE)/pnglite.h @@ -71,8 +71,6 @@ pics/%.o: $(PNGLITE)/%.c $(HEADERS) $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -$(LINTLIB) := SRCS= ../$(LINTSRC) - all: $(LIBS) include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libkmf/libkmf/Makefile.com b/usr/src/lib/libkmf/libkmf/Makefile.com index e860567e48..86a674c87d 100644 --- a/usr/src/lib/libkmf/libkmf/Makefile.com +++ b/usr/src/lib/libkmf/libkmf/Makefile.com @@ -53,12 +53,11 @@ include $(SRC)/lib/Makefile.rootfs SRCDIR= ../common INCDIR= ../../include -LIBS= $(DYNLIB) $(LINTLIB) - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LIBS= $(DYNLIB) LDLIBS += $(BERDERLIB) $(CRYPTOUTILLIB) -lmd -lpkcs11 -lnsl -lsocket -lc LDLIBS += -lcustr +NATIVE_LIBS += libxml2.so # DYNLIB libraries do not have lint libs and are not linted $(DYNLIB) := LDLIBS += -lxml2 @@ -79,6 +78,4 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index 31867e3d2d..05fe0a1e2a 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -39,13 +39,7 @@ BERLIB64= $(BERLIB) OPENSSLLIBS= $(BERLIB) -lcrypto -lcryptoutil -lc OPENSSLLIBS64= $(BERLIB64) -lcrypto -lcryptoutil -lc -LINTSSLLIBS = $(BERLIB) -lcrypto -lcryptoutil -lc -LINTSSLLIBS64 = $(BERLIB64) -lcrypto -lcryptoutil -lc - -# Because of varying openssl implementations, we need to not have lint -# complain if we're being liberal in our suppression directives. -LINTFLAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTFLAGS64 += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED +NATIVE_LIBS += libcrypto.so SRCDIR= ../common INCDIR= ../../include @@ -63,10 +57,7 @@ SMATCH=off PICS= $(OBJECTS:%=pics/%) -lint:= OPENSSLLIBS= $(LINTSSLLIBS) -lint:= OPENSSLLIBS64= $(LINTSSLLIBS64) - -LDLIBS32 += $(OPENSSLLIBS) +LDLIBS32 += $(OPENSSLLIBS) ROOTLIBDIR= $(ROOTFS_LIBDIR)/crypto ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) @@ -74,9 +65,7 @@ ROOTLIBDIR64= $(ROOTFS_LIBDIR)/crypto/$(MACH64) .KEEP_STATE: LIBS = $(DYNLIB) -all: $(DYNLIB) $(LINTLIB) - -lint: lintcheck +all: $(DYNLIB) FRC: diff --git a/usr/src/lib/libnisdb/Makefile b/usr/src/lib/libnisdb/Makefile index 11f21d5100..3aef8d0739 100644 --- a/usr/src/lib/libnisdb/Makefile +++ b/usr/src/lib/libnisdb/Makefile @@ -191,6 +191,8 @@ $(CLNT_PICS) := CPPFLAGS += -I../libnsl/nis/gen LIBS = $(DYNLIB) ZDEFS= +ZGUIDANCE= + LDLIBS += -lnsl -lldap -lc # A number of interfaces are interposed by numerous applications, therefore @@ -207,7 +209,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint .KEEP_STATE: @@ -215,8 +216,6 @@ all: $(DERIVED_FILES) $(LIBS) install: all $(ROOTLIBS) $(ROOTLINKS) -lint: $(DERIVED_FILES) .WAIT lintcheck - objs/%.o pics/%.o profs/%.o: $(YPTOL_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com index 51a3e7a5a6..3ec7bb8d25 100644 --- a/usr/src/lib/libpool/Makefile.com +++ b/usr/src/lib/libpool/Makefile.com @@ -41,12 +41,12 @@ include ../../Makefile.lib # Adding -lxml2 to LDLIBS would cause lint to complain as there is no .ln file # for libxml2, so add it to DYNFLAGS DYNFLAGS += -lxml2 +NATIVE_LIBS += libxml2.so -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lscf -lnvpair -lexacct -lc SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 \ @@ -63,6 +63,4 @@ SMATCH=off all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libscf/Makefile b/usr/src/lib/libscf/Makefile index 41ce640a2d..f6f84bfd52 100644 --- a/usr/src/lib/libscf/Makefile +++ b/usr/src/lib/libscf/Makefile @@ -37,7 +37,6 @@ all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install -lint := TARGET= lint HDRDIR = inc HDRS = libscf.h libscf_priv.h @@ -55,8 +54,6 @@ XGETFLAGS += -a all clean clobber install: native $(SUBDIRS) -lint: $(SUBDIRS) - $(POFILE): pofile_MSGFILES install_h: $(ROOTHDRS) diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com index a534abf962..44e3ac716b 100644 --- a/usr/src/lib/libscf/Makefile.com +++ b/usr/src/lib/libscf/Makefile.com @@ -38,7 +38,7 @@ OBJECTS = \ include ../../Makefile.lib include ../../Makefile.rootfs -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) $(NOT_NATIVE)NATIVE_BUILD = $(POUND_SIGN) $(NATIVE_BUILD)VERS = @@ -49,7 +49,6 @@ LDLIBS += -luutil -lc -lgen -lnvpair LDLIBS += $(LDLIBS_$(MACH)) SRCDIR = ../common -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) COMDIR = ../../../common/svc @@ -75,7 +74,7 @@ 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 -lc -lgen \ - -lnsl -lnvpair + -lnvpair MY_NATIVE_LDLIBS_i386 = -lsmbios MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH)) @@ -83,6 +82,4 @@ MY_NATIVE_LDLIBS += $(MY_NATIVE_LDLIBS_$(MACH)) all: -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libscf/native/Makefile b/usr/src/lib/libscf/native/Makefile index 003d633014..540a99f15a 100644 --- a/usr/src/lib/libscf/native/Makefile +++ b/usr/src/lib/libscf/native/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# NOT_NATIVE = $(POUND_SIGN) # tell Makefile.com we're native @@ -36,6 +34,7 @@ CFLAGS = $(NATIVE_CFLAGS) CPPFLAGS = $(MY_NATIVE_CPPFLAGS) LDFLAGS = LDLIBS = $(MY_NATIVE_LDLIBS) +NATIVE_LIBS += libsmbios.so libnvpair.so libgen.so libc.so all: libuutil .WAIT $(LIBS) diff --git a/usr/src/lib/libshare/Makefile.com b/usr/src/lib/libshare/Makefile.com index efc6613377..fb7d28f694 100644 --- a/usr/src/lib/libshare/Makefile.com +++ b/usr/src/lib/libshare/Makefile.com @@ -35,12 +35,10 @@ include ../../Makefile.lib SRCDIR = ../common LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -# we don't want to lint the sharetab and nfs_sec files -lintcheck := SRCS = $(LIBSRCS) -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lnsl -lscf -lzfs -luuid -lxml2 -lnvpair -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +NATIVE_LIBS += libxml2.so #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) @@ -59,8 +57,6 @@ CPPFLAGS += -D_REENTRANT -I$(NFSLIB_DIR) \ all: $(LIBS) -lint: lintcheck - pics/%.o: $(NFSLIB_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/autofs/Makefile.com b/usr/src/lib/libshare/autofs/Makefile.com index 30c604222b..ada5bdfe56 100644 --- a/usr/src/lib/libshare/autofs/Makefile.com +++ b/usr/src/lib/libshare/autofs/Makefile.com @@ -37,12 +37,10 @@ ROOTLIBDIR = $(ROOT)/usr/lib/fs/autofs ROOTLIBDIR64 = $(ROOT)/usr/lib/fs/autofs/$(MACH64) LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -# we don't want to lint the sources for OTHOBJS since they are pre-existing files -# that are not lint free. -lintcheck := SRCS = $(LIBSRCS) LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -lumem -lc -lxml2 +NATIVE_LIBS += libxml2.so #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) @@ -55,7 +53,7 @@ SMATCH=off CPPFLAGS += -D_REENTRANT -I$(AUTOFSSMFLIB_DIR) \ -I$(ADJUNCT_PROTO)/usr/include/libxml2 \ - -I$(SRCDIR)../common + -I$(SRCDIR)../common .KEEP_STATE: @@ -63,8 +61,6 @@ all: $(LIBS) install: $(ROOTLIBDIR) $(ROOTLIBDIR64) all -lint: lintcheck - pics/%.o: $(AUTOFSSMFLIB_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/autofs/mapfile-vers b/usr/src/lib/libshare/autofs/mapfile-vers index 68f89cf89f..71a63e2c32 100644 --- a/usr/src/lib/libshare/autofs/mapfile-vers +++ b/usr/src/lib/libshare/autofs/mapfile-vers @@ -36,10 +36,11 @@ # MAPFILE HEADER END # -SUNWprivate_1.1 { +$mapfile_version 2 + +SYMBOL_VERSION SUNWprivate_1.1 { global: sa_plugin_ops; local: *; }; - diff --git a/usr/src/lib/libshare/nfs/Makefile.com b/usr/src/lib/libshare/nfs/Makefile.com index e6e9ca01b4..c0384a5ed6 100644 --- a/usr/src/lib/libshare/nfs/Makefile.com +++ b/usr/src/lib/libshare/nfs/Makefile.com @@ -38,12 +38,10 @@ ROOTLIBDIR = $(ROOT)/usr/lib/fs/nfs ROOTLIBDIR64 = $(ROOT)/usr/lib/fs/nfs/$(MACH64) LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -# we don't want to lint the sources for OTHOBJS since they are pre-existing files -# that are not lint free. -lintcheck := SRCS = $(LIBSRCS) LIBS = $(DYNLIB) LDLIBS += -lshare -lnsl -lscf -lumem -lc -lxml2 +NATIVE_LIBS += libxml2.so #add nfs/lib directory as part of the include path CFLAGS += $(CCVERBOSE) @@ -63,8 +61,6 @@ all: $(LIBS) install: all -lint: lintcheck - pics/%.o: $(NFSLIB_DIR)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/smb/Makefile.com b/usr/src/lib/libshare/smb/Makefile.com index c0e735cda7..0d6e9f30cf 100644 --- a/usr/src/lib/libshare/smb/Makefile.com +++ b/usr/src/lib/libshare/smb/Makefile.com @@ -43,10 +43,10 @@ ROOTLIBDIR = $(ROOT)/usr/lib/fs/smb ROOTLIBDIR64 = $(ROOT)/usr/lib/fs/smb/$(MACH64) LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) -lintcheck := SRCS = $(LIBSRCS) LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -luuid -ldlpi -lnsl -lnvpair -lxml2 -lumem -lc +NATIVE_LIBS += libxml2.so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-char-subscripts @@ -65,8 +65,6 @@ all: $(LIBS) install: all -lint: lintcheck - pics/smb_door_client.o: $(SMBBASE_DIR)/smb_door_client.c $(COMPILE.c) -o $@ $(SMBBASE_DIR)/smb_door_client.c $(POST_PROCESS_O) diff --git a/usr/src/lib/libshare/smbfs/Makefile.com b/usr/src/lib/libshare/smbfs/Makefile.com index c07e975163..a99d41b53a 100644 --- a/usr/src/lib/libshare/smbfs/Makefile.com +++ b/usr/src/lib/libshare/smbfs/Makefile.com @@ -39,6 +39,7 @@ LIBSRCS = $(LIBOBJS:%.o=$(SRCDIR)/%.c) LIBS = $(DYNLIB) LDLIBS += -lshare -lscf -lumem -luuid -lc -lxml2 -lsmbfs +NATIVE_LIBS += libxml2.so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -52,8 +53,6 @@ all: $(LIBS) install: $(ROOTLIBDIR) $(ROOTLIBDIR64) all -lint: lintcheck - $(ROOTLIBDIR): $(INS.dir) diff --git a/usr/src/lib/libuutil/native/Makefile b/usr/src/lib/libuutil/native/Makefile index 8f30530f51..0f381ee291 100644 --- a/usr/src/lib/libuutil/native/Makefile +++ b/usr/src/lib/libuutil/native/Makefile @@ -34,6 +34,7 @@ CFLAGS = $(NATIVE_CFLAGS) CPPFLAGS = -I. $(MY_NATIVE_CPPFLAGS) LDFLAGS = LDLIBS = $(MY_NATIVE_LDLIBS) +NATIVE_LIBS += libc.so # # We must use the build's avl headers, to match the common avl.c diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com index 577fa2fbca..ba69fc44ca 100644 --- a/usr/src/lib/libzfs/Makefile.com +++ b/usr/src/lib/libzfs/Makefile.com @@ -61,7 +61,7 @@ include ../../Makefile.lib # libzfs must be installed in the root filesystem for mount(1M) include ../../Makefile.rootfs -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) SRCDIR = ../common @@ -81,28 +81,16 @@ $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG # not linted SMATCH=off -# There's no lint library for zlib, so only include this when building -$(DYNLIB) := LDLIBS += -lz - -LINTFLAGS += -erroff=E_STATIC_UNUSED -LINTFLAGS64 += -erroff=E_STATIC_UNUSED +LDLIBS += -lz +NATIVE_LIBS += libz.so SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \ $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c) -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) - -# lint complains about unused inline functions, even though -# they are "inline", not "static inline", with "extern inline" -# implementations and usage in libzpool. -LINTFLAGS += -erroff=E_STATIC_UNUSED -LINTFLAGS64 += -erroff=E_STATIC_UNUSED .KEEP_STATE: all: $(LIBS) -lint: lintcheck - pics/%.o: ../../../common/zfs/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) diff --git a/usr/src/lib/libzfs_jni/Makefile.com b/usr/src/lib/libzfs_jni/Makefile.com index 693542d081..7d2d4bca6c 100644 --- a/usr/src/lib/libzfs_jni/Makefile.com +++ b/usr/src/lib/libzfs_jni/Makefile.com @@ -40,7 +40,7 @@ OBJECTS= libzfs_jni_dataset.o \ include ../../Makefile.lib -LIBS= $(DYNLIB) $(LINTLIB) +LIBS= $(DYNLIB) INCS += -I$(JAVA_ROOT)/include \ -I$(JAVA_ROOT)/include/solaris @@ -53,12 +53,9 @@ CERRWARN += -_gcc=-Wno-switch SMOFF += all_func_returns SRCDIR = ../common -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com index 38a30b3446..aa7dea9cc9 100644 --- a/usr/src/lib/libzonecfg/Makefile.com +++ b/usr/src/lib/libzonecfg/Makefile.com @@ -28,22 +28,20 @@ OBJECTS= libzonecfg.o getzoneent.o scratchops.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) LDLIBS += -lc -lsocket -luuid -lnvpair -lsysevent -lsec -lbrand \ -lpool -lscf -lproc -luutil -lbsm -lsecdb # DYNLIB libraries do not have lint libs and are not linted $(DYNLIB) := LDLIBS += -lxml2 +NATIVE_LIBS += libxml2.so SRCDIR = ../common CPPFLAGS += -I$(ADJUNCT_PROTO)/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT CERRWARN += $(CNOWARN_UNINIT) CERRWARN += -_gcc=-Wno-parentheses -$(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC) .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index 9861d99912..82406fe3f7 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -71,6 +71,7 @@ CFLAGS += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) LDLIBS += -lcmdutils -lumem -lavl -lnvpair -lz -lc -lsysevent -lmd \ -lfakekernel -lzfs +NATIVE_LIBS += libz.so CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common CPPFLAGS += $(INCS) -DDEBUG -D_FAKE_KERNEL diff --git a/usr/src/lib/policykit/Makefile b/usr/src/lib/policykit/Makefile index b60b67f7a1..fee4bbf9fe 100644 --- a/usr/src/lib/policykit/Makefile +++ b/usr/src/lib/policykit/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib include $(SRC)/lib/policykit/Makefile.policykit diff --git a/usr/src/lib/policykit/Makefile.policykit b/usr/src/lib/policykit/Makefile.policykit index e7f2d8a2da..1cecbeb513 100644 --- a/usr/src/lib/policykit/Makefile.policykit +++ b/usr/src/lib/policykit/Makefile.policykit @@ -30,8 +30,9 @@ POLICYKIT_VERSION = 0.2 POLICYKIT_DBUS_CPPFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE \ -I$(ADJUNCT_PROTO)/usr/include/dbus-1.0 \ -I$(ADJUNCT_PROTO)/usr/lib/dbus-1.0/include -POLICYKIT_GLIB_CPPFLAGS = -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ +POLICYKIT_GLIB_CPPFLAGS = -I$(ADJUNCT_PROTO)/usr/include/glib-2.0 \ -I$(ADJUNCT_PROTO)/usr/lib/glib-2.0/include POLICYKIT_DBUS_LDLIBS = -ldbus-1 POLICYKIT_GLIB_LDLIBS = -lglib-2.0 +NATIVE_LIBS += libglib-2.0.so diff --git a/usr/src/lib/pylibbe/Makefile.com b/usr/src/lib/pylibbe/Makefile.com index 0776d0dea6..07bacdad88 100644 --- a/usr/src/lib/pylibbe/Makefile.com +++ b/usr/src/lib/pylibbe/Makefile.com @@ -45,6 +45,7 @@ LDLIBS += -lbe -lnvpair -lc CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../libbe/common \ -I$(ADJUNCT_PROTO)/usr/include/python$(PYVER)$(PYSUFFIX) +NATIVE_LIBS += libpython$(PYVER)$(PYSUFFIX).so .KEEP_STATE: @@ -54,6 +55,4 @@ all: $(PYOBJS) $(LIBS) install: all $(ROOTPYBEFILES) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/pysolaris/Makefile.com b/usr/src/lib/pysolaris/Makefile.com index 31165206c7..a678360e59 100644 --- a/usr/src/lib/pysolaris/Makefile.com +++ b/usr/src/lib/pysolaris/Makefile.com @@ -44,6 +44,7 @@ C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lsec -lidmap -lpython$(PYVER)$(PYSUFFIX) +NATIVE_LIBS += libpython$(PYVER)$(PYSUFFIX).so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CPPFLAGS += \ @@ -59,6 +60,4 @@ $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)/%: ../common/% $(INS.pyfile) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/lib/pyzfs/Makefile.com b/usr/src/lib/pyzfs/Makefile.com index a7ebf4fe41..7473b27ba9 100644 --- a/usr/src/lib/pyzfs/Makefile.com +++ b/usr/src/lib/pyzfs/Makefile.com @@ -47,6 +47,7 @@ C99LMODE= -Xc99=%all LIBS = $(DYNLIB) LDLIBS += -lc -lnvpair -lpython$(PYVER)$(PYSUFFIX) -lzfs +NATIVE_LIBS += libpython$(PYVER)$(PYSUFFIX).so CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-unused-variable CPPFLAGS += \ @@ -73,6 +74,4 @@ $(ROOTLIBDIR64)/%: % $(ROOTLIBDIR64)/%: ../common/% $(INS.pyfile) -lint: lintcheck - include ../../Makefile.targ |