4853 illumos-gate is not lint-clean when built with openssl 1.0 (fix openssl 0.9.8 lint)

          --- old/usr/src/lib/libkmf/plugins/kmf_openssl/Makefile.com
          +++ new/usr/src/lib/libkmf/plugins/kmf_openssl/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  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  22   22  # Use is subject to license terms.
  23   23  #
  24   24  # Makefile for KMF Plugins
  25   25  #
  26   26  
  27   27  LIBRARY=        kmf_openssl.a
  28   28  VERS=           .1
  29   29  
  30   30  OBJECTS=        openssl_spi.o
  31   31  
  32   32  include $(SRC)/lib/Makefile.lib
  33   33  
  34   34  LIBLINKS=       $(DYNLIB:.so.1=.so)
  35   35  KMFINC=         -I../../../include -I../../../ber_der/inc

  36   36  
  37   37  BERLIB=         -lkmf -lkmfberder
  38   38  BERLIB64=       $(BERLIB)
  39   39  
  40   40  OPENSSLLIBS=    $(BERLIB) -lcrypto -lcryptoutil -lc
  41   41  OPENSSLLIBS64=  $(BERLIB64) -lcrypto -lcryptoutil -lc
  42   42  
  43   43  LINTSSLLIBS     = $(BERLIB) -lcryptoutil -lc
  44   44  LINTSSLLIBS64   = $(BERLIB64) -lcryptoutil -lc
  45   45  
       46 +# OpenSSL 1.0 and 0.9.8 produce different lint warnings
       47 +LINTFLAGS   +=    -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
       48 +LINTFLAGS64 +=    -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
       49 +
  46   50  SRCDIR=         ../common
  47   51  INCDIR=         ../../include
  48   52  
  49   53  CFLAGS          +=      $(CCVERBOSE) 
  50   54  CPPFLAGS        +=      -D_REENTRANT $(KMFINC) \
  51   55                          -I$(INCDIR) -I$(ADJUNCT_PROTO)/usr/include/libxml2
  52   56  
  53   57  CERRWARN        +=      -_gcc=-Wno-unused-label
  54   58  CERRWARN        +=      -_gcc=-Wno-unused-value
  55   59  CERRWARN        +=      -_gcc=-Wno-uninitialized

  56   60  
  57   61  PICS=   $(OBJECTS:%=pics/%)
  58   62  
  59   63  lint:=  OPENSSLLIBS=    $(LINTSSLLIBS)
  60   64  lint:=  OPENSSLLIBS64=  $(LINTSSLLIBS64)
  61   65  
  62   66  LDLIBS32        +=      $(OPENSSLLIBS)
  63   67  
  64   68  ROOTLIBDIR=     $(ROOTFS_LIBDIR)/crypto
  65   69  ROOTLIBDIR64=   $(ROOTFS_LIBDIR)/crypto/$(MACH64)
  66   70  
  67   71  .KEEP_STATE:
  68   72  
  69   73  LIBS    =       $(DYNLIB)
  70   74  all:    $(DYNLIB) $(LINTLIB)
  71   75  
  72   76  lint: lintcheck
  73   77  
  74   78  FRC:
  75   79  
  76   80  include $(SRC)/lib/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX