Merge pull request #124 from mbvreddy/openssl-aix

Build with OpenSSL v1.1.1 on AIX
ibmruntimes · Oct 9, 2018 · 8885d54 · 8885d54
2 parents 82672e6 + e5eacbb
commit 8885d54
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
@@ -4336,7 +4336,7 @@ VS_SDK_PLATFORM_NAME_2017=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1538754016
+DATE_WHEN_GENERATED=1539007666
 
 ###############################################################################
 #

diff --git a/jdk/make/CopyFiles.gmk b/jdk/make/CopyFiles.gmk
@@ -259,6 +259,16 @@ ifneq ($(OPENSSL_BUNDLE_LIB_PATH), )
       OPENSSL_LIB_NAME = libcrypto-1_1.dll
     endif
     OPENSSL_TARGET_LIB = $(JDK_OUTPUTDIR)/bin/$(OPENSSL_LIB_NAME)
+  else ifeq ($(OPENJDK_TARGET_OS), aix)
+    #OpenSSL 1.1.1 on AIX has switched to use archive library files (natural way) instead of '.so' files.
+    #  For reference, corresponding OpenSSL PR is https://github.com/openssl/openssl/pull/6487
+    #OpenSSL v1.1.0 crypto library to bundle with JDK
+    OPENSSL_LIB_NAME = libcrypto.so
+    ifeq ("$(wildcard $(OPENSSL_BUNDLE_LIB_PATH)/$(OPENSSL_LIB_NAME))", "")
+      #OpenSSL v1.1.1 crypto library to bundle with JDK
+      OPENSSL_LIB_NAME = libcrypto.a
+    endif
+    OPENSSL_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(OPENSSL_LIB_NAME)
   else
     OPENSSL_LIB_NAME = libcrypto.so.1.1
     OPENSSL_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(OPENSSL_LIB_NAME)

diff --git a/jdk/make/closed/autoconf/custom-hook.m4 b/jdk/make/closed/autoconf/custom-hook.m4
@@ -472,7 +472,7 @@ AC_DEFUN([CONFIGURE_OPENSSL],
         OPENSSL_DIR=$SRC_ROOT/openssl
         FOUND_OPENSSL=yes
         OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-        OPENSSL_LIBS="-L${OPENSSL_DIR} -lssl -lcrypto"
+        OPENSSL_LIBS="-L${OPENSSL_DIR} -lcrypto"
         if test -s $OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}.1.1; then
           BUILD_OPENSSL=no
         else
@@ -516,13 +516,13 @@ AC_DEFUN([CONFIGURE_OPENSSL],
           if test -s "$OPENSSL_DIR/lib/libcrypto.lib"; then
             FOUND_OPENSSL=yes
             OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-            OPENSSL_LIBS="-libpath:${OPENSSL_DIR}/lib libssl.lib libcrypto.lib"
+            OPENSSL_LIBS="-libpath:${OPENSSL_DIR}/lib libcrypto.lib"
           fi
         else
           if test -s "$OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}.1.1"; then
             FOUND_OPENSSL=yes
             OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-            OPENSSL_LIBS="-L${OPENSSL_DIR} -lssl -lcrypto"
+            OPENSSL_LIBS="-L${OPENSSL_DIR} -lcrypto"
           fi
         fi
       fi

diff --git a/jdk/make/closed/autoconf/generated-configure.sh b/jdk/make/closed/autoconf/generated-configure.sh
@@ -4432,7 +4432,7 @@ VS_SDK_PLATFORM_NAME_2017=
 
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1538754016
+DATE_WHEN_GENERATED=1539007666
 
 ###############################################################################
 #
@@ -15481,7 +15481,7 @@ $as_echo "no" >&6; }
         OPENSSL_DIR=$SRC_ROOT/openssl
         FOUND_OPENSSL=yes
         OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-        OPENSSL_LIBS="-L${OPENSSL_DIR} -lssl -lcrypto"
+        OPENSSL_LIBS="-L${OPENSSL_DIR} -lcrypto"
         if test -s $OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}.1.1; then
           BUILD_OPENSSL=no
         else
@@ -15715,13 +15715,13 @@ $as_echo "$as_me: The path of OPENSSL_DIR, which resolves as \"$path\", is inval
           if test -s "$OPENSSL_DIR/lib/libcrypto.lib"; then
             FOUND_OPENSSL=yes
             OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-            OPENSSL_LIBS="-libpath:${OPENSSL_DIR}/lib libssl.lib libcrypto.lib"
+            OPENSSL_LIBS="-libpath:${OPENSSL_DIR}/lib libcrypto.lib"
           fi
         else
           if test -s "$OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}.1.1"; then
             FOUND_OPENSSL=yes
             OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-            OPENSSL_LIBS="-L${OPENSSL_DIR} -lssl -lcrypto"
+            OPENSSL_LIBS="-L${OPENSSL_DIR} -lcrypto"
           fi
         fi
       fi