Skip to content

Commit

Permalink
Merge pull request #10905 from jdekonin/openssl
Browse files Browse the repository at this point in the history
Update 0.23.0 release branch to use openssl 1.1.1h for all platforms
  • Loading branch information
pshipton committed Oct 16, 2020
2 parents 3d1f208 + 3027485 commit 5bc5d63
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions buildenv/jenkins/variables/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jitserver:
# OpenSSL
#========================================#
openssl:
extra_getsource_options: '--openssl-version=1.1.1g'
extra_getsource_options: '--openssl-version=1.1.1h'
extra_configure_options: '--with-openssl=fetched'
#========================================#
# OpenSSL Bundling
Expand Down Expand Up @@ -464,11 +464,11 @@ x86-64_windows:
freemarker: '/cygdrive/c/openjdk/freemarker.jar'
extra_configure_options:
all: '--disable-ccache --with-cuda="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.0"'
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib64 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_64-VS2013'
11: '--with-toolchain-version=2017 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_64-VS2017'
14: '--with-toolchain-version=2017 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_64-VS2017'
15: '--with-toolchain-version=2019 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_64-VS2019'
next: '--with-toolchain-version=2019 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_64-VS2019'
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib64 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2013'
11: '--with-toolchain-version=2017 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2017'
14: '--with-toolchain-version=2017 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2017'
15: '--with-toolchain-version=2019 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2019'
next: '--with-toolchain-version=2019 --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_64-VS2019'
node_labels:
build: 'ci.role.build && hw.arch.x86 && sw.os.windows'
build_env:
Expand Down Expand Up @@ -509,7 +509,7 @@ x86-32_windows:
release:
8: 'windows-x86-normal-server-release'
extra_configure_options:
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib32 --with-target-bits=32 --disable-ccache --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1g-x86_32-VS2013'
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib32 --with-target-bits=32 --disable-ccache --with-openssl=/cygdrive/c/openjdk/OpenSSL-1.1.1h-x86_32-VS2013'
freemarker: '/cygdrive/c/openjdk/freemarker.jar'
node_labels:
build:
Expand Down

0 comments on commit 5bc5d63

Please sign in to comment.