From 5f647647b2683875bdbed970d955a9e5123284bd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 4 Sep 2023 10:57:49 +0200 Subject: Merging upstream version 1.42.2. Signed-off-by: Daniel Baumann --- packaging/makeself/jobs/20-openssl.install.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'packaging/makeself/jobs/20-openssl.install.sh') 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 -- cgit v1.2.3