Print this page
4853 illumos-gate is not lint-clean when built with openssl 1.0
Reviewed by Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by Alexander Eremin <alexander.eremin@nexenta.com>
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/cmd/ssh/sshd/Makefile
+++ new/usr/src/cmd/ssh/sshd/Makefile
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 # Copyright 2009 Sun Microsystems, Inc. All rights reserved.
22 22 # Use is subject to license terms.
23 23 #
24 24 # cmd/ssh/sshd/Makefile
25 25
26 26 PROG= sshd
27 27
28 28 DIRS= $(ROOTLIBSSH)
29 29
30 30 OBJS = sshd.o \
31 31 altprivsep.o \
32 32 auth.o \
33 33 auth1.o \
34 34 auth2.o \
35 35 auth-options.o \
36 36 auth2-chall.o \
37 37 auth2-gss.o \
38 38 auth2-hostbased.o \
39 39 auth2-kbdint.o \
40 40 auth2-none.o \
41 41 auth2-passwd.o \
42 42 auth2-pam.o \
43 43 auth2-pubkey.o \
44 44 auth-bsdauth.o \
45 45 auth-chall.o \
46 46 auth-rhosts.o \
47 47 auth-krb4.o \
48 48 auth-krb5.o \
49 49 auth-pam.o \
50 50 auth-passwd.o \
51 51 auth-rsa.o \
52 52 auth-rh-rsa.o \
53 53 auth-sia.o \
54 54 auth-skey.o \
55 55 bsmaudit.o \
56 56 groupaccess.o \
57 57 gss-serv.o \
58 58 loginrec.o \
59 59 servconf.o \
60 60 serverloop.o \
61 61 session.o \
62 62 sshlogin.o \
63 63 sshpty.o
64 64
65 65 EXTOBJS = sftp-server.o
66 66
67 67 SRCS = $(OBJS:.o=.c) ../sftp-server/sftp-server.c
↓ open down ↓ |
67 lines elided |
↑ open up ↑ |
68 68
69 69 include ../../Makefile.cmd
70 70 include ../Makefile.ssh-common
71 71
72 72 LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket \
73 73 -lnsl \
74 74 -lz \
75 75 -lpam \
76 76 -lbsm \
77 77 -lwrap \
78 - -lcrypto \
79 78 -lgss \
80 79 -lcontract
81 80 MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
82 81 LDFLAGS += $(MAPFILES:%=-M%)
82 +
83 +# libcrypto has no lint library, so we can only use it when building
84 +$(PROG) := LDLIBS += -lcrypto
83 85
84 86 POFILE_DIR= ..
85 87
86 88 .KEEP_STATE:
87 89
88 90 .PARALLEL: $(OBJS)
89 91
90 92 all: $(PROG)
91 93
92 94 $(PROG): $(OBJS) $(EXTOBJS) $(MAPFILES) ../libssh/$(MACH)/libssh.a \
93 95 ../libopenbsd-compat/$(MACH)/libopenbsd-compat.a
94 96 $(LINK.c) $(OBJS) $(EXTOBJS) -o $@ $(LDLIBS) $(DYNFLAGS)
95 97 $(POST_PROCESS)
96 98
97 99 %.o : ../sftp-server/%.c
98 100 $(COMPILE.c) -o $@ $<
99 101 $(POST_PROCESS_O)
100 102
101 103 install: all $(DIRS) $(ROOTLIBSSHPROG) $(ROOTLIBSSH)
102 104
103 105
104 106 $(ROOTLIBSSHPROG)/%: %
105 107 $(INS.file)
106 108
107 109 $(DIRS):
108 110 $(INS.dir)
109 111
110 112 clean:
111 113 $(RM) $(OBJS) $(EXTOBJS)
112 114
113 115 lint: lint_SRCS
114 116
115 117 include ../Makefile.msg.targ
116 118 include ../../Makefile.targ
↓ open down ↓ |
24 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX