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/lib/libpkg/Makefile.com
+++ new/usr/src/lib/libpkg/Makefile.com
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
22 22 #
23 23 # Copyright 2009 Sun Microsystems, Inc. All rights reserved.
24 24 # Use is subject to license terms.
25 25 #
26 26
27 27 LIBRARY= libpkg.a
28 28 VERS= .1
29 29
30 30 # include library definitions
31 31 OBJECTS= \
32 32 canonize.o ckparam.o ckvolseq.o \
33 33 devtype.o dstream.o gpkglist.o \
34 34 gpkgmap.o isdir.o logerr.o \
35 35 mappath.o ncgrpw.o nhash.o \
36 36 pkgexecl.o pkgexecv.o pkgmount.o \
37 37 pkgtrans.o ppkgmap.o \
38 38 progerr.o putcfile.o rrmdir.o \
39 39 runcmd.o srchcfile.o tputcfent.o \
40 40 verify.o security.o pkgweb.o \
41 41 pkgerr.o keystore.o p12lib.o \
42 42 vfpops.o fmkdir.o pkgstr.o \
43 43 handlelocalfs.o pkgserv.o
44 44
45 45
46 46 # include library definitions
47 47 include $(SRC)/lib/Makefile.lib
48 48
49 49 SRCDIR= ../common
50 50
51 51 POFILE = libpkg.po
52 52 MSGFILES = $(OBJECTS:%.o=../common/%.i)
53 53 CLEANFILES += $(MSGFILES)
54 54
55 55 # This library is NOT lint clean
56 56
↓ open down ↓ |
56 lines elided |
↑ open up ↑ |
57 57 # openssl forces us to ignore dubious pointer casts, thanks to its clever
58 58 # use of macros for stack management.
59 59 LINTFLAGS= -umx -errtags \
60 60 -erroff=E_BAD_PTR_CAST_ALIGN,E_BAD_PTR_CAST
61 61 $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
62 62
63 63
64 64 LIBS = $(DYNLIB) $(LINTLIB)
65 65
66 66
67 -LDLIBS += -lc -lssl -lwanboot -lcrypto -lscf -ladm
67 +LDLIBS += -lc -lwanboot -lscf -ladm
68 +
69 +# libcrypto and libssl have no lint library, and so can only be used when
70 +# building
71 +$(DYNLIB) := LDLIBS += -lcrypto -lssl
68 72
69 73 CFLAGS += $(CCVERBOSE)
70 74 CERRWARN += -_gcc=-Wno-unused-label
71 75 CERRWARN += -_gcc=-Wno-parentheses
72 76 CERRWARN += -_gcc=-Wno-uninitialized
73 77 CERRWARN += -_gcc=-Wno-clobbered
74 78 CERRWARN += -_gcc=-Wno-switch
75 79 CERRWARN += -_gcc=-Wno-unused-value
76 80 CPPFLAGS += -I$(SRCDIR) -D_FILE_OFFSET_BITS=64
77 81
78 82 .KEEP_STATE:
79 83
80 84 all: $(LIBS)
81 85
82 86 $(POFILE): $(MSGFILES)
83 87 $(BUILDPO.msgfiles)
84 88
85 89 _msg: $(MSGDOMAINPOFILE)
86 90
87 91 lint: lintcheck
88 92
89 93 # include library targets
90 94 include $(SRC)/lib/Makefile.targ
91 95 include $(SRC)/Makefile.msg.targ
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX