1427 import libssl

          --- old/usr/src/lib/pkcs11/pkcs11_tpm/Makefile.com
          +++ new/usr/src/lib/pkcs11/pkcs11_tpm/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 +# Copyright 2015 Gary Mills
  21   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  22   23  # Use is subject to license terms.
  23   24  #
  24   25  LIBRARY =       pkcs11_tpm.a
  25   26  VERS =          .1
  26   27  
  27   28  OBJECTS= api_interface.o \
  28   29          apiutil.o \
  29   30          asn1.o \
  30   31          cert.o \

  31   32          data_obj.o \
  32   33          decr_mgr.o \
  33   34          dig_mgr.o \
  34   35          encr_mgr.o \
  35   36          globals.o \
  36   37          hwf_obj.o \
  37   38          key.o \
  38   39          key_mgr.o \
  39   40          loadsave.o \
  40   41          log.o \
  41   42          mech_md5.o \
  42   43          mech_rsa.o \
  43   44          mech_sha.o \
  44   45          new_host.o \
  45   46          obj_mgr.o \
  46   47          object.o \
  47   48          sess_mgr.o \
  48   49          sign_mgr.o \
  49   50          template.o \
  50   51          tpm_specific.o \
  51   52          utility.o \
  52   53          verify_mgr.o
  53   54  
  54   55  
  55   56  include $(SRC)/lib/Makefile.lib
  56   57  
  57   58  SRCDIR= ../common
  58   59  
  59   60  SRCS=   $(OBJECTS:%.o=$(SRCDIR)/%.c)
  60   61  
  61   62  #       set signing mode
  62   63  POST_PROCESS_SO +=      ; $(ELFSIGN_CRYPTO)
  63   64  
  64   65  ROOTLIBDIR=$(ROOT)/usr/lib/security
  65   66  ROOTLIBDIR64=$(ROOT)/usr/lib/security/$(MACH64)

  66   67  
  67   68  LIBS=$(DYNLIB) $(DYNLIB64)
  68   69  
  69   70  TSSROOT=$(ADJUNCT_PROTO)
  70   71  TSPILIBDIR=$(TSSROOT)/usr/lib
  71   72  TSPIINCDIR=$(TSSROOT)/usr/include
  72   73  TSSLIB=-L$(TSPILIBDIR)
  73   74  TSSLIB64=-L$(TSPILIBDIR)/$(MACH64)
  74   75  TSSINC=-I$(TSPIINCDIR)
  75   76  
  76      -LDLIBS += $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi -lcrypto
  77      -CPPFLAGS += -xCC -D_POSIX_PTHREAD_SEMANTICS $(TSSINC)
  78      -CPPFLAGS64 += $(CPPFLAGS)
       77 +# Use libraries and include files from the build host
       78 +LDLIBS=         $(TSSLIB) -L$(ADJUNCT_PROTO)/lib -lc -luuid -lmd -ltspi \
       79 +                -lcrypto
       80 +CPPFLAGS=       $(DTEXTDOM) $(DTS_ERRNO)
       81 +CPPFLAGS +=     -xCC -D_POSIX_PTHREAD_SEMANTICS
       82 +COMPILE.c=      $(CC) $(CFLAGS) $(TSSINC) $(CPPFLAGS) -c
       83 +LINT.c=         $(LINT) $(ONLY_LINT_DEFS) $(LINTFLAGS) $(TSSINC) $(CPPFLAGS) \
       84 +                $(ALWAYS_LINT_DEFS)
       85 +
  79   86  C99MODE=        $(C99_ENABLE)
  80   87  
  81   88  CERRWARN +=     -_gcc=-Wno-parentheses
  82   89  CERRWARN +=     -_gcc=-Wno-unused-label
  83   90  CERRWARN +=     -_gcc=-Wno-uninitialized
  84   91  
  85   92  LINTSRC= $(OBJECTS:%.o=$(SRCDIR)/%.c)
  86   93  
  87   94  $(LINTLIB):=    SRCS    =       $(SRCDIR)/$(LINTSRC)
  88   95  LINTSRC= $(SRCS)

  89   96  
  90   97  CLOBBERFILES += C.ln
  91   98  
  92   99  .KEEP_STATE:
  93  100  
  94  101  all: $(LIBS)
  95  102   
  96  103  lint: $$(LINTSRC)
  97  104          $(LINT.c) $(LINTCHECKFLAGS) $(LINTSRC) $(LDLIBS)
  98  105  
  99  106  pics/%.o: $(SRCDIR)/%.c
 100  107          $(COMPILE.c) -o $@ $<
 101  108          $(POST_PROCESS_O)
 102  109  
 103  110  include $(SRC)/lib/Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX