8411 Build should warn when linking against libraries outside proto area

          --- 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 +# Copyright 2017 RackTop Systems.
  25   26  #
  26   27  
  27   28  LIBRARY =       libwanboot.a
  28   29  VERS =          .1
  29   30  
  30   31  # List of locally located modules.
  31   32  LOC_DIR =       ../common
  32   33  LOC_OBJS =      socket_inet.o bootinfo_aux.o
  33   34  LOC_SRCS =      $(LOC_OBJS:%.o=$(LOC_DIR)/%.c)
  34   35  

  35   36  # List of common wanboot objects.
  36   37  COM_DIR =       ../../../common/net/wanboot
  37   38  COM_OBJS =      auxutil.o \
  38   39                  boot_http.o \
  39   40                  bootconf.o \
  40   41                  bootconf_errmsg.o \
  41   42                  bootinfo.o \
  42   43                  bootlog.o \
  43   44                  http_errorstr.o \
  44   45                  p12access.o \
  45   46                  p12auxpars.o \
  46   47                  p12auxutl.o \
  47   48                  p12err.o \
  48   49                  p12misc.o \
  49   50                  parseURL.o
  50   51  COM_SRCS =      $(COM_OBJS:%.o=$(COM_DIR)/%.c)
  51   52  
  52   53  # List of common DHCP modules.
  53   54  DHCP_DIR =      $(SRC)/common/net/dhcp

  54   55  DHCP_OBJS =     dhcpinfo.o
  55   56  DHCP_SRCS =     $(DHCP_OBJS:%.o=$(DHCP_DIR)/%.c)
  56   57  
  57   58  OBJECTS =       $(LOC_OBJS) $(COM_OBJS) $(DHCP_OBJS)
  58   59  
  59   60  include ../../Makefile.lib
  60   61  
  61   62  LIBS +=         $(LINTLIB)
  62   63  LDLIBS +=       -lnvpair -lresolv -lnsl -lsocket -ldevinfo -ldhcputil \
  63   64                  -linetutil -lc -lcrypto -lssl
       65 +
       66 +# Allow libcrypto and libssl to be taken from outside the proto area.
       67 +$(ADJUNCT_PROTO_NOT_SET)DYNFLAGS += $(ZASSERTDEFLIB)=libcrypto.so
       68 +$(ADJUNCT_PROTO_NOT_SET)DYNFLAGS += $(ZASSERTDEFLIB)=libssl.so
       69 +
  64   70  CPPFLAGS =      -I$(SRC)/common/net/wanboot/crypt $(CPPFLAGS.master)
  65   71  CERRWARN +=     -_gcc=-Wno-switch
  66   72  CERRWARN +=     -_gcc=-Wno-parentheses
  67   73  CERRWARN +=     -_gcc=-Wno-unused-value
  68   74  CERRWARN +=     -_gcc=-Wno-uninitialized
  69   75  
  70   76  # Must override SRCS from Makefile.lib since sources have
  71   77  # multiple source directories.
  72   78  SRCS =          $(LOC_SRCS) $(COM_SRCS) $(DHCP_SRCS)
  73   79  

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

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX