commit:     1eb991ed3dae45db517e713dfdbf93ffe6be21d4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 19:19:56 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 07:03:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb991ed

profiles/prefix/darwin/macos/package.mask: move 11.0/12.0 mask here

In order to keep duplication low, move the cmake mask from 11.0/12.0
profiles to this level, even though this compiles/works fine on older
macOS versions.  This is the same as the glib masks we do that make
things like gzip and nano fail to compile.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 profiles/prefix/darwin/macos/11.0/package.mask | 6 ------
 profiles/prefix/darwin/macos/12.0/package.mask | 6 ------
 profiles/prefix/darwin/macos/package.mask      | 6 +++++-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/profiles/prefix/darwin/macos/11.0/package.mask 
b/profiles/prefix/darwin/macos/11.0/package.mask
deleted file mode 100644
index 9dcb3967e082..000000000000
--- a/profiles/prefix/darwin/macos/11.0/package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grob...@gentoo.org> (2022-01-08)
-# malloc crash during install, bug #830425
-=dev-util/cmake-3.22.1

diff --git a/profiles/prefix/darwin/macos/12.0/package.mask 
b/profiles/prefix/darwin/macos/12.0/package.mask
deleted file mode 100644
index 9dcb3967e082..000000000000
--- a/profiles/prefix/darwin/macos/12.0/package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grob...@gentoo.org> (2022-01-08)
-# malloc crash during install, bug #830425
-=dev-util/cmake-3.22.1

diff --git a/profiles/prefix/darwin/macos/package.mask 
b/profiles/prefix/darwin/macos/package.mask
index a406d72c1e6a..1d194495f268 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,8 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grob...@gentoo.org> (2022-01-08)
+# malloc crash during install on >=11.0, bug #830425
+=dev-util/cmake-3.22.1
+
 # Sam James <s...@gentoo.org> (2021-12-23)
-# Fails to build due to gnulib errors:
+# 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

Reply via email to