From 947dbc1cdb7c142448381e1fb4797b27c5e907e1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 29 Oct 2024 22:11:23 +0100 Subject: [PATCH] libressl.sh: update issue status, add non-workaround code [ci skip] https://github.com/libressl/portable/issues/1118 https://github.com/libressl/portable/pull/1119 --- libressl.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libressl.sh b/libressl.sh index e6476701f..26f63dab7 100755 --- a/libressl.sh +++ b/libressl.sh @@ -16,6 +16,7 @@ # - No obvious way to selectively disable obsolete protocols/APIs/features. # - `--prefix` ignored in `cmake --install` for /etc/ssl files. # https://github.com/libressl/portable/issues/1118 +# https://github.com/libressl/portable/pull/1119 [MERGED. Expected in 4.0.1] # shellcheck disable=SC3040,SC2039 set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail @@ -81,10 +82,14 @@ _VER="$1" "-DCMAKE_ASM_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" cmake --build "${_BLDDIR}" - # FIXME upstream: - # cmake --install "${_BLDDIR}" --prefix "${_PP}" - # ignores --prefix for /etc/ssl config files and fails when writing them. - DESTDIR="${_PKGDIR}" cmake --install "${_BLDDIR}" + if [ "${LIBRESSL_VER_}" = '4.0.0' ]; then + # FIXME upstream: + # cmake --install "${_BLDDIR}" --prefix "${_PP}" + # ignores --prefix for /etc/ssl config files and fails when writing them. + DESTDIR="${_PKGDIR}" cmake --install "${_BLDDIR}" + else + cmake --install "${_BLDDIR}" --prefix "${_PP}" + fi # Delete .pc files rm -r -f "${_PP}"/lib/pkgconfig