commit: b9c2d328a423d5465ddef28ca1ae8c8c4f5f18c0
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 12:54:35 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 12:54:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c2d328
profiles/prefix/darwin/macos: migrate 10.5/ppc to generic gcc feature
- add fsf-gcc-ld64 feature (to replace fsf-gcc-nold)
- make 10.5/pcc include fsf-gcc-ld64
- add dummy 10.5/ppc/gcc for consistency with other gcc-based profiles
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
profiles/prefix/darwin/macos/10.5/ppc/gcc/eapi | 1 +
profiles/prefix/darwin/macos/10.5/ppc/gcc/parent | 1 +
profiles/prefix/darwin/macos/10.5/ppc/package.unmask | 2 --
profiles/prefix/darwin/macos/10.5/ppc/parent | 1 +
profiles/prefix/darwin/macos/arch/ppc/package.mask | 1 -
.../prefix/darwin/macos/features/fsf-gcc-ld64/package.mask | 6 ++++++
.../darwin/macos/features/fsf-gcc-ld64/package.use.mask | 11 +++++++++++
.../darwin/macos/{10.5/ppc => features/fsf-gcc-ld64}/packages | 6 +++---
8 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/gcc/eapi
b/profiles/prefix/darwin/macos/10.5/ppc/gcc/eapi
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/ppc/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/gcc/parent
b/profiles/prefix/darwin/macos/10.5/ppc/gcc/parent
new file mode 100644
index 00000000000..f3229c5b987
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/ppc/gcc/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
b/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
deleted file mode 100644
index 320a6bbb1a0..00000000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/parent
b/profiles/prefix/darwin/macos/10.5/ppc/parent
index 59ddeb924a6..504ae43340f 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc/parent
@@ -1,2 +1,3 @@
..
+../../features/fsf-gcc-ld64
../../arch/ppc
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask
b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index fd829701ef5..23098222ed9 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -12,4 +12,3 @@
# version 8.2.1 are unmasked for us, allowing a non-gcc-apple path, we
# dropped all versions inbetween, mask the incompatible ones remaining
=sys-devel/binutils-apple-8.2.1-r1
-=sys-devel/binutils-apple-11.3.1-r1
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask
b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask
new file mode 100644
index 00000000000..913b4a72b20
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# packages which link to framework and therefore fail (blocks)
+dev-util/pkgconfig
+=sys-devel/binutils-apple-11.3.1-r1
diff --git
a/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.use.mask
b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.use.mask
new file mode 100644
index 00000000000..9c5970c451a
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.use.mask
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ulrich Müller <[email protected]> (2020-11-29)
+# GCC's Objective-C compiler fails to build the Aqua/Cocoa interface.
+# Bug #757300
+app-editors/emacs aqua
+
+# Cocoa integration requires frameworks, and this is a bridge too far
+# for current FSF GCC
+x11-libs/cairo aqua
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/packages
b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/packages
similarity index 50%
rename from profiles/prefix/darwin/macos/10.5/ppc/packages
rename to profiles/prefix/darwin/macos/features/fsf-gcc-ld64/packages
index 6d26e561561..3fb8f4bcf79 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/packages
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/packages
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Mac OS X Leopard/PPC uses FSF gcc and gcc-apple (not Clang)
+# usage of FSF GCC, disabling Clang
*sys-devel/gcc
*sys-devel/gcc-config
-*sys-devel/clang
-*sys-devel/gcc-apple
+-*sys-devel/gcc-apple
