12334 fix gcc4 build
12322 kdb: removal of unused dependency recommended
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>

          --- old/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com
          +++ new/usr/src/lib/krb5/plugins/kdb/ldap/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  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
       25 +# Copyright 2020 Joyent, Inc.
  25   26  #
  26   27  
  27   28  LIBRARY= kldap.a
  28   29  VERS= .1
  29   30  
  30   31  # XXX need to set the install path to plugin dir
  31   32  
  32   33  # ldap plugin objects
  33   34  LDAP_OBJS= \
  34   35          ldap_exp.o

  35   36  
  36   37  OBJECTS= $(LDAP_OBJS)
  37   38  
  38   39  # include library definitions

  39   40  include $(SRC)/lib/krb5/Makefile.lib
  40   41  
  41   42  LIBS=           $(DYNLIB)
  42   43  SRCS=   $(LDAP_OBJS:%.o=../%.c)
  43   44  
  44   45  include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
  45   46  
  46   47  #override liblink
  47   48  INS.liblink=    -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@
  48   49  
  49      -CPPFLAGS +=     -DHAVE_CONFIG_H \
       50 +CPPFLAGS +=     -DHAVE_CONFIG_H \
  50   51                  -I$(SRC)/cmd/krb5/iprop \
  51   52                  -I$(SRC)/lib/krb5 \
  52   53                  -I$(SRC)/lib/krb5/kdb \
  53   54                  -I$(SRC)/lib/krb5/plugins/kdb/ldap/libkdb_ldap \
  54   55                  -I$(SRC)/lib/gss_mechs/mech_krb5/include \
  55   56                  -I$(SRC)/lib/gss_mechs/mech_krb5/krb5/os \
  56   57                  -I$(SRC)/lib/gss_mechs/mech_krb5/include/krb5 \
  57   58                  -I$(SRC)/uts/common/gssapi/include/ \
  58   59                  -I$(SRC)/uts/common/gssapi/mechs/krb5/include \
  59   60                  -DKRB5_DEPRECATED=1 -DKRB5_PRIVATE=1 \
  60   61                  -DUSE_KADM5_API_VERSION=2
  61   62  
  62   63  CFLAGS +=       $(CCVERBOSE)
  63   64  CERRWARN +=     -_gcc=-Wno-parentheses
  64   65  CERRWARN +=     -_gcc=-Wno-unused-function
  65   66  
  66   67  DYNFLAGS +=     $(KERBRUNPATH)
  67   68  # setting -L $(ROOT)/usr/lib/gss because libkdb_ldap needs mech_krb5
  68      -LDLIBS +=       -L $(ROOT)/usr/lib/gss -L $(ROOTLIBDIR) -lkdb_ldap \
  69      -                -lc
       69 +LDLIBS +=       -L $(ROOT)/usr/lib/gss -L $(ROOTLIBDIR) -lkdb_ldap
  70   70  
  71   71  .KEEP_STATE:
  72   72  
  73   73  all:    $(LIBS)
  74   74  
  75      -lint:   lintcheck
  76      -
  77   75  # include library targets
  78   76  include $(SRC)/lib/krb5/Makefile.targ
  79   77  
  80   78  FRC:
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX