commit: 3788eef280dcff5d415b4b1c3af1c1e58767a0b1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 19:04:52 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 19:04:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3788eef2
profiles: restore 32-bits Intel Mac OS X 10.5 profile
This partially reverts commits
75712aea0939827c4efbd5b2eae81e29f66404e6
a9160b7464a1176ed63e7c4e7ce49f89e3afa647
The ppc variant is much more easily tested via the x86 variant.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
profiles/arch.list | 1 +
profiles/prefix/darwin/macos/10.5/x86/eapi | 1 +
profiles/prefix/darwin/macos/10.5/x86/make.defaults | 5 +++++
profiles/prefix/darwin/macos/10.5/x86/package.mask | 2 ++
profiles/prefix/darwin/macos/10.5/x86/package.unmask | 3 +++
profiles/prefix/darwin/macos/10.5/x86/package.use.force | 6 ++++++
profiles/prefix/darwin/macos/10.5/x86/package.use.mask | 4 ++++
profiles/prefix/darwin/macos/10.5/x86/parent | 2 ++
profiles/prefix/darwin/macos/10.5/x86/use.mask | 14 ++++++++++++++
profiles/prefix/darwin/macos/arch/x86/eapi | 1 +
profiles/prefix/darwin/macos/arch/x86/make.defaults | 16 ++++++++++++++++
profiles/prefix/darwin/macos/arch/x86/package.mask | 5 +++++
profiles/prefix/darwin/macos/arch/x86/package.use.force | 3 +++
profiles/prefix/darwin/macos/arch/x86/package.use.mask | 13 +++++++++++++
profiles/prefix/darwin/macos/arch/x86/use.force | 6 ++++++
profiles/prefix/darwin/macos/arch/x86/use.mask | 6 ++++++
profiles/profiles.desc | 3 ++-
17 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/profiles/arch.list b/profiles/arch.list
index 2aad1ae7f4db..7bb08e3b8787 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -23,5 +23,6 @@ riscv-linux
x86-linux
arm64-macos
ppc-macos
+x86-macos
x64-macos
x64-solaris
diff --git a/profiles/prefix/darwin/macos/10.5/x86/eapi
b/profiles/prefix/darwin/macos/10.5/x86/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults
b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
new file mode 100644
index 000000000000..862b30eaffe8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-apple-darwin9"
+CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.mask
b/profiles/prefix/darwin/macos/10.5/x86/package.mask
new file mode 100644
index 000000000000..583e92d8cf2d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.unmask
b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
new file mode 100644
index 000000000000..9ded76ad8abd
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
@@ -0,0 +1,3 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.force
b/profiles/prefix/darwin/macos/10.5/x86/package.use.force
new file mode 100644
index 000000000000..433d91d9357e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Elias Pipping <pipp...@gentoo.org> (2007-09-30)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
new file mode 100644
index 000000000000..0ef52a1767e9
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
@@ -0,0 +1,4 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
diff --git a/profiles/prefix/darwin/macos/10.5/x86/parent
b/profiles/prefix/darwin/macos/10.5/x86/parent
new file mode 100644
index 000000000000..93220d096824
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.5/x86/use.mask
b/profiles/prefix/darwin/macos/10.5/x86/use.mask
new file mode 100644
index 000000000000..f4c15ffdbdd6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/x86/use.mask
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 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
diff --git a/profiles/prefix/darwin/macos/arch/x86/eapi
b/profiles/prefix/darwin/macos/arch/x86/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults
b/profiles/prefix/darwin/macos/arch/x86/make.defaults
new file mode 100644
index 000000000000..5fd08b523f6e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults
@@ -0,0 +1,16 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="x86-macos"
+ACCEPT_KEYWORDS="~x86-macos"
+
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+
+# multilib build stuff, single ABI (no multilib)
+MULTILIB_ABIS="x86"
+DEFAULT_ABI="x86"
+ABI="x86"
+IUSE_IMPLICIT="abi_x86_32"
+LIBDIR_x86="lib"
+# figure out automatically what is the best to use
+CFLAGS="-march=native"
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.mask
b/profiles/prefix/darwin/macos/arch/x86/package.mask
new file mode 100644
index 000000000000..5930472f1b1c
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/package.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force
b/profiles/prefix/darwin/macos/arch/x86/package.use.force
new file mode 100644
index 000000000000..9ded76ad8abd
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.force
@@ -0,0 +1,3 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask
b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
new file mode 100644
index 000000000000..dcd35623faaf
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
@@ -0,0 +1,13 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# All the Mac OS X profiles inherit from their matching arch profile here.
+
+
+# Jeremy Olexa <darks...@gentoo.org> (2010-07-29)
+# Relocation issues on 32-bit OSX, bug #329859
+media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_sse
+
+# Fabian Groffen <grob...@gentoo.org> (2009-02-01)
+# Doesn't compile, bug #257225
+media-video/ffmpeg cpu_flags_x86_mmx
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force
b/profiles/prefix/darwin/macos/arch/x86/use.force
new file mode 100644
index 000000000000..abc39335ace6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag corresponding to the default ABI
+x86-macos
+abi_x86_32
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask
b/profiles/prefix/darwin/macos/arch/x86/use.mask
new file mode 100644
index 000000000000..e2603bddf883
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/x86/use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the flag corresponding to the default ABI
+-x86-macos
+-abi_x86_32
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 1f64033b28a1..996a48a5d7b2 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -635,8 +635,9 @@ x86-linux default/linux/x86/17.0/prefix/kernel-2.6.16+
exp
arm-linux default/linux/arm/17.0/armv7a/prefix/kernel-3.2+
exp
arm64-linux default/linux/arm64/17.0/prefix/kernel-3.2+
exp
-# Mac OS X Profiles
+# macOS Profiles
ppc-macos prefix/darwin/macos/10.5/ppc/gcc
exp
+x86-macos prefix/darwin/macos/10.5/x86/gcc
exp
x64-macos prefix/darwin/macos/10.11/x64
exp
x64-macos prefix/darwin/macos/10.13/x64
exp
x64-macos prefix/darwin/macos/10.13/x64/gcc
exp
