Print this page
8982 Support building with OpenSSL 1.1

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile
          +++ new/usr/src/Makefile
↓ open down ↓ 18 lines elided ↑ open up ↑
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  26   26  # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved.
  27   27  # Copyright 2016 Toomas Soome <tsoome@me.com>
  28   28  # Copyright 2017 Joyent, Inc.
       29 +# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
  29   30  #
  30   31  
  31   32  #
  32   33  # Makefile for system source
  33   34  #
  34   35  # include global definitions
  35   36  include Makefile.master
  36   37  #
  37   38  # the Targetdirs file is the AT&T target.dirs file in a makefile format.
  38   39  # it defines TARGETDIRS and ROOTDIRS.
↓ open down ↓ 242 lines elided ↑ open up ↑
 281  282                  fi;                                             \
 282  283          fi
 283  284  
 284  285  java-version:
 285  286          @if [ -x "$(JAVAC)" ]; then                     \
 286  287                  $(ECHO) $(JAVAC);                       \
 287  288                  $(JAVA_ROOT)/bin/java -fullversion 2>&1 | head -1;      \
 288  289          else                                            \
 289  290                  $(ECHO) No Java compiler found;         \
 290  291                  exit 1;                                 \
      292 +        fi
      293 +
      294 +openssl-version:
      295 +        @if [ -x "$(OPENSSL)" ]; then                           \
      296 +                $(ECHO) $(OPENSSL);                             \
      297 +                $(OPENSSL) version;                             \
      298 +                $(OPENSSL) version -f |                         \
      299 +                    $(SED) -n '/_API/{s/.*_API/    API/;s/ -.*//;p;}'; \
      300 +        else                                                    \
      301 +                $(ECHO) No OpenSSL utility found;               \
 291  302          fi
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX