4853 illumos-gate is not lint-clean when built with openssl 1.0

          --- old/usr/src/lib/libwanboot/Makefile.com
          +++ new/usr/src/lib/libwanboot/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  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  #
  26   26  
  27   27  LIBRARY =       libwanboot.a
  28   28  VERS =          .1
  29   29  
  30   30  # List of locally located modules.
  31   31  LOC_DIR =       ../common
  32   32  LOC_OBJS =      socket_inet.o bootinfo_aux.o
  33   33  LOC_SRCS =      $(LOC_OBJS:%.o=$(LOC_DIR)/%.c)
  34   34  
  35   35  # List of common wanboot objects.
  36   36  COM_DIR =       ../../../common/net/wanboot
  37   37  COM_OBJS =      auxutil.o \
  38   38                  boot_http.o \
  39   39                  bootconf.o \
  40   40                  bootconf_errmsg.o \
  41   41                  bootinfo.o \
  42   42                  bootlog.o \
  43   43                  http_errorstr.o \
  44   44                  p12access.o \
  45   45                  p12auxpars.o \
  46   46                  p12auxutl.o \
  47   47                  p12err.o \
  48   48                  p12misc.o \
  49   49                  parseURL.o
  50   50  COM_SRCS =      $(COM_OBJS:%.o=$(COM_DIR)/%.c)
  51   51  
  52   52  # List of common DHCP modules.

  53   53  DHCP_DIR =      $(SRC)/common/net/dhcp
  54   54  DHCP_OBJS =     dhcpinfo.o
  55   55  DHCP_SRCS =     $(DHCP_OBJS:%.o=$(DHCP_DIR)/%.c)
  56   56  
  57   57  OBJECTS =       $(LOC_OBJS) $(COM_OBJS) $(DHCP_OBJS)
  58   58  
  59   59  include ../../Makefile.lib
  60   60  
  61   61  LIBS +=         $(LINTLIB)
  62   62  LDLIBS +=       -lnvpair -lresolv -lnsl -lsocket -ldevinfo -ldhcputil \
  63      -                -linetutil -lc -lcrypto -lssl
       63 +                -linetutil -lc
       64 +
       65 +# libsunw_crypto and libsunw_ssl have no lint library, so we can only use it when
       66 +# building
       67 +$(DYNLIB) := LDLIBS += -lsunw_crypto -lsunw_ssl
       68 +
  64   69  CPPFLAGS =      -I$(SRC)/common/net/wanboot/crypt $(CPPFLAGS.master)
  65   70  CERRWARN +=     -_gcc=-Wno-switch
  66   71  CERRWARN +=     -_gcc=-Wno-parentheses
  67   72  CERRWARN +=     -_gcc=-Wno-unused-value
  68   73  CERRWARN +=     -_gcc=-Wno-uninitialized
  69   74  
  70   75  # Must override SRCS from Makefile.lib since sources have
  71   76  # multiple source directories.
  72   77  SRCS =          $(LOC_SRCS) $(COM_SRCS) $(DHCP_SRCS)
  73   78  

  74   79  # Must define location of lint library source.
  75   80  SRCDIR =        $(LOC_DIR)
  76   81  $(LINTLIB) :=   SRCS = $(SRCDIR)/$(LINTSRC)
  77   82  
  78   83  # OpenSSL requires us to turn this off
  79   84  LINTFLAGS   +=    -erroff=E_BAD_PTR_CAST_ALIGN
  80   85  LINTFLAGS64 +=    -erroff=E_BAD_PTR_CAST_ALIGN
  81   86  
  82   87  CFLAGS +=       $(CCVERBOSE)
  83   88  CPPFLAGS +=     -I$(LOC_DIR) -I$(COM_DIR) -I$(DHCP_DIR)
  84   89  
  85   90  .KEEP_STATE:
  86   91  
  87   92  all: $(LIBS)
  88   93  
  89   94  lint: lintcheck
  90   95  
  91   96  pics/%.o: $(COM_DIR)/%.c
  92   97          $(COMPILE.c) -o $@ $<
  93   98          $(POST_PROCESS_O)
  94   99  
  95  100  pics/%.o: $(DHCP_DIR)/%.c
  96  101          $(COMPILE.c) -o $@ $<
  97  102          $(POST_PROCESS_O)
  98  103  
  99  104  include ../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX