summaryrefslogtreecommitdiff
path: root/profiles/prefix/darwin
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/prefix/darwin')
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/package.mask6
-rw-r--r--profiles/prefix/darwin/macos/11.0/arm64/eapi1
-rw-r--r--profiles/prefix/darwin/macos/11.0/arm64/make.defaults5
-rw-r--r--profiles/prefix/darwin/macos/11.0/arm64/parent2
-rw-r--r--profiles/prefix/darwin/macos/arch/arm64/eapi1
-rw-r--r--profiles/prefix/darwin/macos/arch/arm64/make.defaults11
-rw-r--r--profiles/prefix/darwin/macos/arch/arm64/profile.bashrc23
-rw-r--r--profiles/prefix/darwin/macos/arch/arm64/use.force7
-rw-r--r--profiles/prefix/darwin/macos/arch/arm64/use.mask7
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/package.mask15
-rw-r--r--profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask5
-rw-r--r--profiles/prefix/darwin/macos/package.mask15
-rw-r--r--profiles/prefix/darwin/package.mask8
-rw-r--r--profiles/prefix/darwin/package.use.mask2
14 files changed, 69 insertions, 39 deletions
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
deleted file mode 100644
index ba9daf5618b6..000000000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2018-06-18)
-# FSF GCC is our system compiler here
--sys-devel/gcc
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/eapi b/profiles/prefix/darwin/macos/11.0/arm64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/make.defaults b/profiles/prefix/darwin/macos/11.0/arm64/make.defaults
new file mode 100644
index 000000000000..6de9f160caa6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/arm64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm64-apple-darwin20"
+CHOST_arm64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/parent b/profiles/prefix/darwin/macos/11.0/arm64/parent
new file mode 100644
index 000000000000..269f6f48bb15
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/arm64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/arch/arm64/eapi b/profiles/prefix/darwin/macos/arch/arm64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/arch/arm64/make.defaults b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
new file mode 100644
index 000000000000..3ceab05d32e1
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64-macos"
+ACCEPT_KEYWORDS="~x64-macos" # this is a hack whilst we don't have full system
+
+# multilib build stuff, single ABI (no multilib)
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+LIBDIR_arm64="lib"
diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
new file mode 100644
index 000000000000..6bfe36915c9d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pre_src_configure() {
+ # catch when multiple pkgs are in one ebuild
+ pushd "${WORKDIR}" > /dev/null
+
+ # macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64),
+ # which config.sub currently doesn't understand about. It is,
+ # however, Apple who seem to use arm64-apple-darwin20 CHOST
+ # triplets, so patch that for various versions of autoconf
+ # This bit should be kept in sync with fix_config_sub in
+ # bootstrap-prefix.sh
+ if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
+ # Apple Silicon doesn't use aarch64, but arm64
+ find . -name "config.sub" | \
+ xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
+ find . -name "config.sub" | \
+ xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
+ fi
+
+ popd > /dev/null
+}
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
new file mode 100644
index 000000000000..b4557bfe8498
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag corresponding to the default ABI
+x64-macos
+arm64-macos
+abi_arm64
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
new file mode 100644
index 000000000000..2b0df2c9ccf9
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the flag corresponding to the default ABI
+-x64-macos
+-arm64-macos
+-abi_arm64
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index 05a1b5c5c541..fd829701ef56 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -7,12 +7,9 @@
# Fabian Groffen <grobian@gentoo.org> (2012-03-05)
# Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
-# a backport of PPC support was kept until compilation with gcc-apple
-# was no longer possible since 7.0.
-# The only working versions are 3.2 and (patched) 6.3, however the
-# latter causes bus errors whilst compiling e.g. GCC
-=sys-devel/binutils-apple-4.3-r2
-=sys-devel/binutils-apple-5.1-r1
-=sys-devel/binutils-apple-6.1-r1
-=sys-devel/binutils-apple-6.3-r2
->sys-devel/binutils-apple-6.99999
+# darwin-xtools added back support and allows to be compiled from FSF
+# GCC for version ld64-274.2 (8.2.1), so basically 3.2.3 and the xtools
+# 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-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index 90c1048e4022..bcc732c3eb55 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -5,11 +5,6 @@
# able to compile binutils-apple
sys-devel/binutils-apple
-sys-devel/native-cctools
-# and unmask FSF GCC itself of course
--sys-devel/gcc
# packages which link to framework and therefore fail (blocks)
dev-util/pkgconfig
-
-# cmake-3.19.1 works for us
-->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 831cbe6cf8a8..4f8cc88126e6 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,17 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Fabian Groffen <grobian@gentoo.org> (2020-12-20)
+# we need to establish this darwin-xcode version can really be our
+# linker once we figure out TAPI support
+=sys-devel/binutils-apple-8.2.1-r100
+
# Fabian Groffen <grobian@gentoo.org> (2020-11-23)
# no symbols from libopenbsd-compat
=net-misc/openssh-8.3_p1-r5
=net-misc/openssh-8.4_p1-r2
-
-# Fabian Groffen <grobian@gentoo.org> (2020-06-09)
-# fails to compile, needs fixing
-=sys-apps/gentoo-functions-0.13
-
-# Fabian Groffen <grobian@gentoo.org> (2019-03-22)
-# Newer versions break because they insist on sysroot usage lacking
-# -lSystem as looked for by clang/llvm. If your system got this
-# package, you have to emerge -C cmake and re-emerge it.
->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index a0cd86ce4ca8..fbda04428af4 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -5,14 +5,6 @@
# util-linux has no business on Darwin systems
sys-apps/util-linux
-# Fabian Groffen <grobian@gentoo.org> (2012-02-19)
-# Using FSF GCC on Mac OS X is not supported by Gentoo Prefix. While
-# the FSF GCC compiler is certainly useful, some - if not many -
-# packages expect the Apple branch of GCC, and its (sometimes peculiar)
-# behaviour. Do not file bugs for packages that fail to compile with
-# FSF GCC, if you have patches, please send them directly to upstream.
-sys-devel/gcc
-
# Fabian Groffen <grobian@gentoo.org> (2011-12-30)
# Does not support Darwin, http://mj.ucw.cz/pciutils.html
sys-apps/pciutils
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 4b41e3402a55..e99219cedba4 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2020-12-01)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 18:01:53 +0000