1
0
forked from 0ad/0ad

build-osx-libs: Update GnuTLS to 3.6.13 (unbreak macOS 10.15)

This includes a workaround that should be removed when it is fixed
upstream (LDFLAGS=).
It disables guile support, since we do not need it and it fails to
compile too.

Patch by: Krinkle
Reviewed By: wraitii
Fixes #5729

Differential Revision: https://code.wildfiregames.com/D2716
This was SVN commit r23772.
This commit is contained in:
wraitii 2020-06-14 10:30:14 +00:00
parent 4b1a4ef4cf
commit e8b3fe81cc

View File

@ -37,7 +37,7 @@ VORBIS_VERSION="libvorbis-1.3.6"
GMP_VERSION="gmp-6.1.2"
NETTLE_VERSION="nettle-3.5.1"
# NOTE: remember to also update LIB_URL below when changing version
GNUTLS_VERSION="gnutls-3.6.8"
GNUTLS_VERSION="gnutls-3.6.13"
GLOOX_VERSION="gloox-1.0.22"
# OS X only includes part of ICU, and only the dylib
# NOTE: remember to also update LIB_URL below when changing version
@ -700,8 +700,9 @@ then
--with-included-libtasn1 \
--without-p11-kit \
--disable-tests \
--disable-guile \
--disable-nls \
&& make ${JOBS} && make install) || die "GnuTLS build failed"
&& make ${JOBS} LDFLAGS= install) || die "GnuTLS build failed"
popd
echo "$LIB_VERSION" > .already-built
else