diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-02-06 15:53:30 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-02-06 15:53:30 -0500 |
| commit | 367956210cc1111bc97610eef96e5b781093bdb8 (patch) | |
| tree | e03e99142843caa6f7145a65767f20bb35410222 | |
| parent | 4ab74a22afe1ec6b0e0980c8eca56cf25182aa7f (diff) | |
| parent | 87ac38635bca3ad78b33c32c180ddd98902428fd (diff) | |
| download | illumos-joyent-367956210cc1111bc97610eef96e5b781093bdb8.tar.gz | |
Merge branch 'master' into nfs-zone
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/cmd/sendmail/src/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com | 3 | ||||
| -rw-r--r-- | usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile index 7d72bad58f..0efa270e8b 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/wpad/Makefile @@ -34,8 +34,7 @@ include ../../../Makefile.cmd ROOTMANIFESTDIR = $(ROOTSVCNETWORK) LDLIBS += -ldladm -ldlpi -NATIVE_LIBS += libcrypto.so -all install := LDLIBS += -lcrypto +all install := LDLIBS += -lsunw_crypto SMOFF += all_func_returns diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile index 8791902399..e488312e99 100644 --- a/usr/src/cmd/sendmail/src/Makefile +++ b/usr/src/cmd/sendmail/src/Makefile @@ -46,8 +46,7 @@ LDFLAGS += $(MAPFILES:%=-M%) LDLIBS += ../libsmutil/libsmutil.a ../libsm/libsm.a -lresolv -lsocket \ -lnsl ../db/libdb.a -lldap -lsldap -lwrap -lumem \ - -lssl -lcrypto -lsasl -NATIVE_LIBS += libssl.so libcrypto.so + -lsunw_ssl -lsunw_crypto -lsasl INCPATH= -I. -I../include -I../db diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com index 99814777f1..361550a94a 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com @@ -73,8 +73,7 @@ SMATCH=off CFLAGS += $(CCVERBOSE) -I.. DYNFLAGS += $(KRUNPATH) $(KMECHLIB) -znodelete -LDLIBS += -L $(ROOTLIBDIR) -lcrypto -lc -NATIVE_LIBS += libcrypto.so +LDLIBS += -L $(ROOTLIBDIR) -lsunw_crypto -lc ROOTLIBDIR= $(ROOT)/usr/lib/krb5/plugins/preauth diff --git a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com index 95aff359da..1ff4abafdd 100644 --- a/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com +++ b/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com @@ -39,8 +39,6 @@ BERLIB64= $(BERLIB) OPENSSLLIBS= $(BERLIB) -lsunw_crypto -lcryptoutil -lc OPENSSLLIBS64= $(BERLIB64) -lsunw_crypto -lcryptoutil -lc -NATIVE_LIBS += libcrypto.so - SRCDIR= ../common INCDIR= ../../include |