commit: 78ede4d591c8c16e65e14414389ab9b6a58f21eb
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 16:27:21 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 16:30:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ede4d5
p/p/darwin/macos/14.0: prepare for the upcoming macOS release.
Refactorize to merge the use.mask files into single directories.
Suggested-by: Jiajie Chen <jiegec <AT> qq.com>
Reported-by: Chuangyu Ding <dchy12792246 <AT> icloud.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
profiles/prefix/darwin/macos/10.11/x64/use.mask | 30 ----------------------
profiles/prefix/darwin/macos/10.13/x64/use.mask | 30 ----------------------
profiles/prefix/darwin/macos/10.14/x64/use.mask | 30 ----------------------
profiles/prefix/darwin/macos/10.15/x64/use.mask | 30 ----------------------
.../prefix/darwin/macos/11.0/arm64/gcc/use.mask | 5 ----
profiles/prefix/darwin/macos/11.0/x64/use.mask | 30 ----------------------
.../prefix/darwin/macos/12.0/arm64/gcc/use.mask | 5 ----
profiles/prefix/darwin/macos/12.0/x64/use.mask | 30 ----------------------
.../prefix/darwin/macos/13.0/arm64/gcc/use.mask | 5 ----
profiles/prefix/darwin/macos/13.0/x64/use.mask | 30 ----------------------
profiles/prefix/darwin/macos/14.0/arm64/eapi | 1 +
profiles/prefix/darwin/macos/14.0/arm64/gcc/eapi | 1 +
profiles/prefix/darwin/macos/14.0/arm64/gcc/parent | 2 ++
.../prefix/darwin/macos/14.0/arm64/make.defaults | 5 ++++
profiles/prefix/darwin/macos/14.0/arm64/parent | 2 ++
profiles/prefix/darwin/macos/14.0/eapi | 1 +
profiles/prefix/darwin/macos/14.0/make.defaults | 4 +++
profiles/prefix/darwin/macos/14.0/package.use.mask | 7 +++++
profiles/prefix/darwin/macos/14.0/parent | 1 +
profiles/prefix/darwin/macos/14.0/profile.bashrc | 4 +++
profiles/prefix/darwin/macos/14.0/x64/eapi | 1 +
profiles/prefix/darwin/macos/14.0/x64/gcc/eapi | 1 +
profiles/prefix/darwin/macos/14.0/x64/gcc/parent | 2 ++
.../prefix/darwin/macos/14.0/x64/make.defaults | 5 ++++
profiles/prefix/darwin/macos/14.0/x64/parent | 2 ++
.../darwin/macos/arch/arm64/package.use.mask | 9 ++++++-
profiles/prefix/darwin/macos/arch/x64/use.mask | 21 ++++++++++++++-
profiles/profiles.desc | 2 ++
28 files changed, 69 insertions(+), 227 deletions(-)
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask
b/profiles/prefix/darwin/macos/10.11/x64/use.mask
deleted file mode 100644
index 3e153701348d..000000000000
--- a/profiles/prefix/darwin/macos/10.11/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/10.13/x64/use.mask
b/profiles/prefix/darwin/macos/10.13/x64/use.mask
deleted file mode 100644
index 3e153701348d..000000000000
--- a/profiles/prefix/darwin/macos/10.13/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/10.14/x64/use.mask
b/profiles/prefix/darwin/macos/10.14/x64/use.mask
deleted file mode 100644
index a36750571e81..000000000000
--- a/profiles/prefix/darwin/macos/10.14/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/10.15/x64/use.mask
b/profiles/prefix/darwin/macos/10.15/x64/use.mask
deleted file mode 100644
index 67647c3611bb..000000000000
--- a/profiles/prefix/darwin/macos/10.15/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/gcc/use.mask
b/profiles/prefix/darwin/macos/11.0/arm64/gcc/use.mask
deleted file mode 100644
index da062601beda..000000000000
--- a/profiles/prefix/darwin/macos/11.0/arm64/gcc/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# SSP seems to cause asm/assembly errors with GCC, so disable it
-ssp
diff --git a/profiles/prefix/darwin/macos/11.0/x64/use.mask
b/profiles/prefix/darwin/macos/11.0/x64/use.mask
deleted file mode 100644
index 67647c3611bb..000000000000
--- a/profiles/prefix/darwin/macos/11.0/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/12.0/arm64/gcc/use.mask
b/profiles/prefix/darwin/macos/12.0/arm64/gcc/use.mask
deleted file mode 100644
index da062601beda..000000000000
--- a/profiles/prefix/darwin/macos/12.0/arm64/gcc/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# SSP seems to cause asm/assembly errors with GCC, so disable it
-ssp
diff --git a/profiles/prefix/darwin/macos/12.0/x64/use.mask
b/profiles/prefix/darwin/macos/12.0/x64/use.mask
deleted file mode 100644
index e59a89413c3a..000000000000
--- a/profiles/prefix/darwin/macos/12.0/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
b/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
deleted file mode 100644
index d60bd645fe97..000000000000
--- a/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# SSP seems to cause asm/assembly errors with GCC, so disable it
-ssp
diff --git a/profiles/prefix/darwin/macos/13.0/x64/use.mask
b/profiles/prefix/darwin/macos/13.0/x64/use.mask
deleted file mode 100644
index 02ca6e7eae53..000000000000
--- a/profiles/prefix/darwin/macos/13.0/x64/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/14.0/arm64/eapi
b/profiles/prefix/darwin/macos/14.0/arm64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/arm64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/14.0/arm64/gcc/eapi
b/profiles/prefix/darwin/macos/14.0/arm64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/arm64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/14.0/arm64/gcc/parent
b/profiles/prefix/darwin/macos/14.0/arm64/gcc/parent
new file mode 100644
index 000000000000..5ebbfd24d627
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/arm64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/14.0/arm64/make.defaults
b/profiles/prefix/darwin/macos/14.0/arm64/make.defaults
new file mode 100644
index 000000000000..22ced1348860
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/arm64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm64-apple-darwin23"
+CHOST_arm64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/14.0/arm64/parent
b/profiles/prefix/darwin/macos/14.0/arm64/parent
new file mode 100644
index 000000000000..a75c3ad0a555
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/arm64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/arm64
diff --git a/profiles/prefix/darwin/macos/14.0/eapi
b/profiles/prefix/darwin/macos/14.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/14.0/make.defaults
b/profiles/prefix/darwin/macos/14.0/make.defaults
new file mode 100644
index 000000000000..2878504ccd12
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="14.0"
diff --git a/profiles/prefix/darwin/macos/14.0/package.use.mask
b/profiles/prefix/darwin/macos/14.0/package.use.mask
new file mode 100644
index 000000000000..c43bf1e37402
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <[email protected]> (2011-04-10)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/14.0/parent
b/profiles/prefix/darwin/macos/14.0/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/14.0/profile.bashrc
b/profiles/prefix/darwin/macos/14.0/profile.bashrc
new file mode 100644
index 000000000000..c67ad98e42c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/profile.bashrc
@@ -0,0 +1,4 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=14.0
diff --git a/profiles/prefix/darwin/macos/14.0/x64/eapi
b/profiles/prefix/darwin/macos/14.0/x64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/x64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/14.0/x64/gcc/eapi
b/profiles/prefix/darwin/macos/14.0/x64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/x64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/14.0/x64/gcc/parent
b/profiles/prefix/darwin/macos/14.0/x64/gcc/parent
new file mode 100644
index 000000000000..fceecddb55c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-ld64
diff --git a/profiles/prefix/darwin/macos/14.0/x64/make.defaults
b/profiles/prefix/darwin/macos/14.0/x64/make.defaults
new file mode 100644
index 000000000000..5a5e7a57e6b8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/x64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-apple-darwin23"
+CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/14.0/x64/parent
b/profiles/prefix/darwin/macos/14.0/x64/parent
new file mode 100644
index 000000000000..269f6f48bb15
--- /dev/null
+++ b/profiles/prefix/darwin/macos/14.0/x64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
index 5ccad25049d5..278f35a3ca9f 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
@@ -1,6 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Benda Xu <[email protected]> (2023-07-10)
+# SSP seems to cause asm/assembly errors with GCC, so disable it
+# commit a1d7199cec8a296bae885481931ddea824262d88
+# Author: Fabian Groffen <[email protected]>
+# Date: Sun Feb 7 20:09:02 2021 +0100
+sys-devel/gcc ssp
+
# Sam James <[email protected]> (2021-11-09)
# Older GMP releases have a bug in their arm64 Darwin ASM
# 6.2.2 isn't released but this will catch any releases we know are broken
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask
b/profiles/prefix/darwin/macos/arch/x64/use.mask
index 6bf08722e781..9abac72e41b6 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Unmask the flag corresponding to the default ABI
@@ -27,3 +27,22 @@
-cpu_flags_x86_sse4a
-cpu_flags_x86_ssse3
-cpu_flags_x86_xop
+
+# Unmask x86 instruction sets
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 563718973e22..932db6289110 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -400,11 +400,13 @@ x64-macos prefix/darwin/macos/11.0/x64/gcc
exp
x64-macos prefix/darwin/macos/12.0/x64
exp
x64-macos prefix/darwin/macos/12.0/x64/gcc
exp
x64-macos prefix/darwin/macos/13.0/x64/gcc
exp
+x64-macos prefix/darwin/macos/14.0/x64/gcc
exp
arm64-macos prefix/darwin/macos/11.0/arm64
exp
arm64-macos prefix/darwin/macos/11.0/arm64/gcc
exp
arm64-macos prefix/darwin/macos/12.0/arm64
exp
arm64-macos prefix/darwin/macos/12.0/arm64/gcc
exp
arm64-macos prefix/darwin/macos/13.0/arm64/gcc
exp
+arm64-macos prefix/darwin/macos/14.0/arm64/gcc
exp
# Solaris Profiles
x64-solaris prefix/sunos/solaris/5.11/x64
exp
