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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A610E158088 for ; Sun, 16 Jan 2022 12:20:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37E782BC015; Sun, 16 Jan 2022 12:20:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B663C2BC005 for ; Sun, 16 Jan 2022 12:20:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43006342EEE for ; Sun, 16 Jan 2022 12:20:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C86624E for ; Sun, 16 Jan 2022 12:20:31 +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: <1642335626.69f5c7eeaf5f0c12eaddbda183102f1c7eaf2f6c.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/prefix/darwin/macos/package.mask profiles/prefix/darwin/macos/profile.bashrc X-VCS-Directories: profiles/prefix/darwin/macos/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 69f5c7eeaf5f0c12eaddbda183102f1c7eaf2f6c X-VCS-Branch: master Date: Sun, 16 Jan 2022 12:20:31 +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: c61cfc7a-6835-40b8-a005-ed1bf981d7b8 X-Archives-Hash: cbf29c06c943aabdfa5b901adf44a1c3 commit: 69f5c7eeaf5f0c12eaddbda183102f1c7eaf2f6c Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 16 12:15:18 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 16 12:20:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f5c7ee profiles/prefix/darwin/macos: use global fix for gnulib breakage Bug: https://bugs.gentoo.org/831026 Bug: https://bugs.gentoo.org/829847 Signed-off-by: Fabian Groffen gentoo.org> profiles/prefix/darwin/macos/package.mask | 9 --------- profiles/prefix/darwin/macos/profile.bashrc | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index 1d194495f268..0b90c5562381 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -4,12 +4,3 @@ # Fabian Groffen (2022-01-08) # malloc crash during install on >=11.0, bug #830425 =dev-util/cmake-3.22.1 - -# Sam James (2021-12-23) -# Fails to build due to gnulib errors on >=11.0: -# ```timespec.h:52:21: error: expected identifier or ‘(’ before ‘struct’ -# 52 | _GL_TIMESPEC_INLINE struct timespec``` -# bug #829847 -=app-editors/nano-5.9 -=app-editors/nano-6.0 -=app-arch/gzip-1.11 diff --git a/profiles/prefix/darwin/macos/profile.bashrc b/profiles/prefix/darwin/macos/profile.bashrc new file mode 100644 index 000000000000..fc81d01031c4 --- /dev/null +++ b/profiles/prefix/darwin/macos/profile.bashrc @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +if [[ ${EBUILD_PHASE} == prepare ]]; then + # workaround for Gnulib bug that affects multiple packages: gzip, wget, + # nano, etc + # https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00053.html + # https://bugs.gentoo.org/829847 + # https://bugs.gentoo.org/831026 + find "${S}" -name "config.h*" \ + | xargs grep -l "define _GL_INLINE static _GL_UNUSED" \ + | while read file + do + einfo "fixing gnulib inline bug in ${file#${S}/}" + origfile="${file}".gnulib-fix.$$ + mv "${file}" "${origfile}" + sed -e 's/define _GL_INLINE static _GL_UNUSED/define _GL_INLINE _GL_UNUSED static/' \ + -e 's/define _GL_EXTERN_INLINE static _GL_UNUSED/define _GL_EXTERN_INLINE _GL_UNUSED static/' \ + "${origfile}" > "${file}" + touch -r "${origfile}" "${file}" + done +fi +