diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 12:30:01 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 12:30:01 +0000 |
| commit | e7a46c7be17beafa9e5973e0aa2e5a18d38db82f (patch) | |
| tree | 9eda57d83b8023583d3473bfd34b9238b1287819 /usr/src/lib/libscf | |
| parent | 0efa232c593d8fe393b56fb1ff4dda751660b3b3 (diff) | |
| parent | 5801b0f01c3c34499a929ed96164a5a68b470945 (diff) | |
| download | illumos-joyent-e7a46c7be17beafa9e5973e0aa2e5a18d38db82f.tar.gz | |
[illumos-gate merge]
commit 5801b0f01c3c34499a929ed96164a5a68b470945
12217 add ld assert-deflib and guidance to gate build
commit 948761701ebc8a0cf820a973780b2fbb931c4390
12262 Suboptimal vmem hash table slows down boot
commit cdd7a662d2c0914e93e1daa44cebae7003c99777
12254 python changes have broken the zfs test suite
Conflicts:
usr/src/lib/libzonecfg/Makefile.com
usr/src/lib/libc/sparcv9/Makefile.com
usr/src/lib/libc/sparc/Makefile.com
usr/src/lib/libc/i386/Makefile.com
usr/src/lib/libc/amd64/Makefile
usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
usr/src/lib/Makefile
usr/src/cmd/sendmail/src/Makefile
usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile
Diffstat (limited to 'usr/src/lib/libscf')
| -rw-r--r-- | usr/src/lib/libscf/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/libscf/Makefile.com | 7 | ||||
| -rw-r--r-- | usr/src/lib/libscf/native/Makefile | 3 |
3 files changed, 3 insertions, 10 deletions
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) |