Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with OpenSSL v1.1.1 on AIX #124

Merged
merged 2 commits into from
Oct 9, 2018
Merged

Build with OpenSSL v1.1.1 on AIX #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48ac78
Build with OpenSSL v1.1.1 on AIX
mbvreddy Oct 8, 2018
e5eacbb
remove -lssl as on AIX, it adds additional unnecessary dependency wit…
mbvreddy Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

###############################################################################
#
Expand Down
10 changes: 10 additions & 0 deletions jdk/make/CopyFiles.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions jdk/make/closed/autoconf/custom-hook.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions jdk/make/closed/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

###############################################################################
#
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down