diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-09-04 08:57:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-09-04 08:57:49 +0000 |
commit | 5f647647b2683875bdbed970d955a9e5123284bd (patch) | |
tree | 66dcf1d9f7a60cd19dd9ac410e27d5f6ead521d3 /packaging/makeself/jobs/20-openssl.install.sh | |
parent | Releasing debian version 1.42.1-1. (diff) | |
download | netdata-5f647647b2683875bdbed970d955a9e5123284bd.tar.xz netdata-5f647647b2683875bdbed970d955a9e5123284bd.zip |
Merging upstream version 1.42.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/makeself/jobs/20-openssl.install.sh')
-rwxr-xr-x | packaging/makeself/jobs/20-openssl.install.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/packaging/makeself/jobs/20-openssl.install.sh b/packaging/makeself/jobs/20-openssl.install.sh index 35667a51f..04ec2626f 100755 --- a/packaging/makeself/jobs/20-openssl.install.sh +++ b/packaging/makeself/jobs/20-openssl.install.sh @@ -36,13 +36,22 @@ fi cd "${NETDATA_MAKESELF_PATH}/tmp/openssl" || exit 1 if [ "${CACHE_HIT:-0}" -eq 0 ]; then - run ./config -static no-tests --prefix=/openssl-static --openssldir=/opt/netdata/etc/ssl + sed -i "s/disable('static', 'pic', 'threads');/disable('static', 'pic');/" Configure + run ./config -static threads no-tests --prefix=/openssl-static --openssldir=/opt/netdata/etc/ssl run make -j "$(nproc)" fi run make -j "$(nproc)" install_sw +if [ -d "/openssl-static/lib" ]; then + cd "/openssl-static" || exit 1 + ln -s "lib" "lib64" || true + cd - || exit 1 +fi + store_cache openssl "${NETDATA_MAKESELF_PATH}/tmp/openssl" +perl configdata.pm --dump + # shellcheck disable=SC2015 [ "${GITHUB_ACTIONS}" = "true" ] && echo "::endgroup::" || true |