| 1 |
commit: 1eb991ed3dae45db517e713dfdbf93ffe6be21d4 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 11 19:19:56 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 12 07:03:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb991ed |
| 7 |
|
| 8 |
profiles/prefix/darwin/macos/package.mask: move 11.0/12.0 mask here |
| 9 |
|
| 10 |
In order to keep duplication low, move the cmake mask from 11.0/12.0 |
| 11 |
profiles to this level, even though this compiles/works fine on older |
| 12 |
macOS versions. This is the same as the glib masks we do that make |
| 13 |
things like gzip and nano fail to compile. |
| 14 |
|
| 15 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 16 |
|
| 17 |
profiles/prefix/darwin/macos/11.0/package.mask | 6 ------ |
| 18 |
profiles/prefix/darwin/macos/12.0/package.mask | 6 ------ |
| 19 |
profiles/prefix/darwin/macos/package.mask | 6 +++++- |
| 20 |
3 files changed, 5 insertions(+), 13 deletions(-) |
| 21 |
|
| 22 |
diff --git a/profiles/prefix/darwin/macos/11.0/package.mask b/profiles/prefix/darwin/macos/11.0/package.mask |
| 23 |
deleted file mode 100644 |
| 24 |
index 9dcb3967e082..000000000000 |
| 25 |
--- a/profiles/prefix/darwin/macos/11.0/package.mask |
| 26 |
+++ /dev/null |
| 27 |
@@ -1,6 +0,0 @@ |
| 28 |
-# Copyright 1999-2022 Gentoo Authors |
| 29 |
-# Distributed under the terms of the GNU General Public License v2 |
| 30 |
- |
| 31 |
-# Fabian Groffen <grobian@g.o> (2022-01-08) |
| 32 |
-# malloc crash during install, bug #830425 |
| 33 |
-=dev-util/cmake-3.22.1 |
| 34 |
|
| 35 |
diff --git a/profiles/prefix/darwin/macos/12.0/package.mask b/profiles/prefix/darwin/macos/12.0/package.mask |
| 36 |
deleted file mode 100644 |
| 37 |
index 9dcb3967e082..000000000000 |
| 38 |
--- a/profiles/prefix/darwin/macos/12.0/package.mask |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,6 +0,0 @@ |
| 41 |
-# Copyright 1999-2022 Gentoo Authors |
| 42 |
-# Distributed under the terms of the GNU General Public License v2 |
| 43 |
- |
| 44 |
-# Fabian Groffen <grobian@g.o> (2022-01-08) |
| 45 |
-# malloc crash during install, bug #830425 |
| 46 |
-=dev-util/cmake-3.22.1 |
| 47 |
|
| 48 |
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask |
| 49 |
index a406d72c1e6a..1d194495f268 100644 |
| 50 |
--- a/profiles/prefix/darwin/macos/package.mask |
| 51 |
+++ b/profiles/prefix/darwin/macos/package.mask |
| 52 |
@@ -1,8 +1,12 @@ |
| 53 |
# Copyright 1999-2022 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
+# Fabian Groffen <grobian@g.o> (2022-01-08) |
| 57 |
+# malloc crash during install on >=11.0, bug #830425 |
| 58 |
+=dev-util/cmake-3.22.1 |
| 59 |
+ |
| 60 |
# Sam James <sam@g.o> (2021-12-23) |
| 61 |
-# Fails to build due to gnulib errors: |
| 62 |
+# Fails to build due to gnulib errors on >=11.0: |
| 63 |
# ```timespec.h:52:21: error: expected identifier or ‘(’ before ‘struct’ |
| 64 |
# 52 | _GL_TIMESPEC_INLINE struct timespec``` |
| 65 |
# bug #829847 |
Archives