From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 117CA158086 for ; Sat, 16 Oct 2021 12:38:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F2D1E0798; Sat, 16 Oct 2021 12:38:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FF15E0798 for ; Sat, 16 Oct 2021 12:38:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CC2034303C for ; Sat, 16 Oct 2021 12:38:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8899414C for ; Sat, 16 Oct 2021 12:38:04 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1634387882.2b52e245430421877b2156d6c1fedde718a5d486.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/wget/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/wget/wget-1.21.2.ebuild X-VCS-Directories: net-misc/wget/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2b52e245430421877b2156d6c1fedde718a5d486 X-VCS-Branch: master Date: Sat, 16 Oct 2021 12:38:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d4c1d34-4485-4fb2-9dab-9b1c71d96526 X-Archives-Hash: 0eda48c093fc39094f0bf696f8961a83 commit: 2b52e245430421877b2156d6c1fedde718a5d486 Author: Fabian Groffen gentoo org> AuthorDate: Sat Oct 16 12:37:51 2021 +0000 Commit: Fabian Groffen gentoo 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 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