From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 8 Jan 2019 14:16:56 +0000 (+0100)
Subject: net-misc/curl: generalise darwin fixes
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=526e80864c5dceb7840f9512023064fef69c0946;p=gentoo.git

net-misc/curl: generalise darwin fixes

darwin < 10.8 won't compile due to force injection of
-mmacos-min-vers=10.8.  Kill the messing around with CFLAGS for macOS
entirely to resolve all build issues.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
---

diff --git a/net-misc/curl/curl-7.63.0-r1.ebuild b/net-misc/curl/curl-7.63.0-r1.ebuild
index 4e33ca7fc888..525bbd549f48 100644
--- a/net-misc/curl/curl-7.63.0-r1.ebuild
+++ b/net-misc/curl/curl-7.63.0-r1.ebuild
@@ -101,16 +101,11 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
 
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
 
 	eapply_user
 	eprefixify curl-config.in
 	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
 }
 
 multilib_src_configure() {