[gentoo-commits] repo/gentoo:master commit in: net-misc/wget/

[Fabian Groffen]

commit:     2b52e245430421877b2156d6c1fedde718a5d486
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 12:37:51 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 12:38:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b52e245

net-misc/wget-1.21.2: update fixes for Darwin

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-misc/wget/wget-1.21.2.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index 5dee2e984f6..27f69c718b3 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -68,6 +68,14 @@ src_prepare() {
 			-e 's/^  LIBICONV=$/:/' \
 			configure || die
 	fi
+
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -le 17 ]] ; then
+		# Fix older Darwin inline definition problem
+		# fixed upstream
+		# https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=29d79d473f52b0ec58f50c95ef782c66fc0ead21
+		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
+			src/config.h.in || die
+	fi
 }
 
 src_configure() {
@@ -75,12 +83,6 @@ src_configure() {
 	# the included gnutls -- force ioctl.h to include this header
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
-		append-cppflags '-D__nonnull\(X\)='
-	fi
-
 	if use static ; then
 		append-ldflags -static
 		tc-export PKG_CONFIG