diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
| commit | 7a34fde236609b18147eb73e6a163e19162d96e2 (patch) | |
| tree | 11d647767f5036bbcccee110ad13891ed603a972 /usr/src/lib/libresolv2/Makefile.com | |
| parent | 0de99a4637b946f1cd1c7d9fb5949112e1afb82f (diff) | |
| parent | c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff) | |
| download | illumos-joyent-7a34fde236609b18147eb73e6a163e19162d96e2.tar.gz | |
[illumos-gate merge]
commit c653bb4713ca694c2d16b04b65d5b76c0bb46bd4
10197 build smatch in parallel
commit 15c07adc1c7b828006b5e3c4d528b92229d6bd23
10081 smatch indenting fixes for usr/src/uts
commit 5661bb7641e85c46713da7a3002b29ecd2c3daf0
10080 smatch Makefile changes for usr/src/cmd
commit 05ede3db5e3b7d540afbccdc872c735770e82ef3
10079 smatch Makefile changes for usr/src/lib
commit cadd68ea0014761eda6a293664086dfa80686d85
10078 smatch fixes for UCB
commit 1ea94c756c0bc9170021d7b570944a24f224c03f
10202 loader: use screen-#rows to find bottom left co-ordinates
commit 08487eea68a2fa501b5042131c6db068089f82e1
10173 loader: support newer ZFS versions
Conflicts:
usr/src/lib/libdladm/Makefile.com
usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
Diffstat (limited to 'usr/src/lib/libresolv2/Makefile.com')
| -rw-r--r-- | usr/src/lib/libresolv2/Makefile.com | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/src/lib/libresolv2/Makefile.com b/usr/src/lib/libresolv2/Makefile.com index 942d2a69b8..35e1eca77c 100644 --- a/usr/src/lib/libresolv2/Makefile.com +++ b/usr/src/lib/libresolv2/Makefile.com @@ -22,7 +22,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# +# Copyright (c) 2018, Joyent, Inc. LIBRARY= libresolv.a VERS= .2 @@ -32,16 +32,16 @@ BSDOBJS= putenv.o strcasecmp.o strsep.o \ gettimeofday.o setenv.o strerror.o utimes.o \ mktemp.o setitimer.o strpbrk.o writev.o -DSTOBJS= dst_api.o support.o hmac_link.o +DSTOBJS= dst_api.o support.o hmac_link.o -# inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with +# inet_addr, inet_pton, inet_ntop, and inet_ntoa removed due to overlap with # libnsl INETOBJS= inet_net_pton.o inet_neta.o inet_lnaof.o \ inet_netof.o nsap_addr.o inet_makeaddr.o \ inet_network.o inet_net_ntop.o inet_cidr_ntop.o \ inet_cidr_pton.o inet_data.o -# build only the IRS objects that the ISC libbind's make would +# build only the IRS objects that the ISC libbind's make would IRSTHROBJS= gethostent_r.o getnetent_r.o getnetgrent_r.o \ getprotoent_r.o getservent_r.o IRSOBJS= ${IRSTHROBJS} \ @@ -108,10 +108,13 @@ LOCFLAGS += $(CRYPTFLAGS) LOCFLAGS += -D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \ $(SOLCOMPAT) -I../include -I../../common/inc -CPPFLAGS += $(LOCFLAGS) +CPPFLAGS += $(LOCFLAGS) CERRWARN += -_gcc=-Wno-implicit-function-declaration +# not linted +SMATCH=off + DYNFLAGS += $(ZNODELETE) LDLIBS += -lsocket -lnsl -lc -lmd |