Skip to content

Commit 947dbc1

Browse files
committed
libressl.sh: update issue status, add non-workaround code [ci skip]
libressl/portable#1118 libressl/portable#1119
1 parent cf680b4 commit 947dbc1

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

libressl.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# - No obvious way to selectively disable obsolete protocols/APIs/features.
1717
# - `--prefix` ignored in `cmake --install` for /etc/ssl files.
1818
# https://github.com/libressl/portable/issues/1118
19+
# https://github.com/libressl/portable/pull/1119 [MERGED. Expected in 4.0.1]
1920

2021
# shellcheck disable=SC3040,SC2039
2122
set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail
@@ -81,10 +82,14 @@ _VER="$1"
8182
"-DCMAKE_ASM_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
8283

8384
cmake --build "${_BLDDIR}"
84-
# FIXME upstream:
85-
# cmake --install "${_BLDDIR}" --prefix "${_PP}"
86-
# ignores --prefix for /etc/ssl config files and fails when writing them.
87-
DESTDIR="${_PKGDIR}" cmake --install "${_BLDDIR}"
85+
if [ "${LIBRESSL_VER_}" = '4.0.0' ]; then
86+
# FIXME upstream:
87+
# cmake --install "${_BLDDIR}" --prefix "${_PP}"
88+
# ignores --prefix for /etc/ssl config files and fails when writing them.
89+
DESTDIR="${_PKGDIR}" cmake --install "${_BLDDIR}"
90+
else
91+
cmake --install "${_BLDDIR}" --prefix "${_PP}"
92+
fi
8893

8994
# Delete .pc files
9095
rm -r -f "${_PP}"/lib/pkgconfig

0 commit comments

Comments
 (0)