From e8b3fe81ccf5efc0e69c34d17e85106407c82508 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Sun, 14 Jun 2020 10:30:14 +0000
Subject: [PATCH] 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.
---
 libraries/osx/build-osx-libs.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/osx/build-osx-libs.sh b/libraries/osx/build-osx-libs.sh
index 8b0583ed08..250538369c 100755
--- a/libraries/osx/build-osx-libs.sh
+++ b/libraries/osx/build-osx-libs.sh
@@ -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