public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/10.10/, profiles/prefix/darwin/macos/10.13/, ...
@ 2019-11-11 14:14 Fabian Groffen
  0 siblings, 0 replies; only message in thread
From: Fabian Groffen @ 2019-11-11 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     9c96882e0a8213e4ca44baa38fc13401fb815028
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 14:12:31 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 14:14:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c96882e

profiles/prefix/darwin/macos: require various system headers

Pull in system headers as part of @system, because Apple really doesn't
want to install them a nicely reachable space for us, breaking our
compilers and environments.  Provide OS-specific versions installed in
the Prefix itself.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 profiles/prefix/darwin/macos/10.10/packages       | 6 ++++++
 profiles/prefix/darwin/macos/10.11/packages       | 6 ++++++
 profiles/prefix/darwin/macos/10.12/package.unmask | 7 ++++++-
 profiles/prefix/darwin/macos/10.13/package.unmask | 7 ++++++-
 profiles/prefix/darwin/macos/10.14/package.unmask | 7 ++++++-
 profiles/prefix/darwin/macos/10.4/packages        | 6 ++++++
 profiles/prefix/darwin/macos/10.5/packages        | 6 ++++++
 profiles/prefix/darwin/macos/10.6/packages        | 6 ++++++
 profiles/prefix/darwin/macos/10.7/packages        | 6 ++++++
 profiles/prefix/darwin/macos/10.8/packages        | 6 ++++++
 profiles/prefix/darwin/macos/10.9/packages        | 6 ++++++
 profiles/prefix/darwin/macos/package.mask         | 6 ++++++
 profiles/prefix/darwin/macos/packages             | 8 ++++++--
 13 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/profiles/prefix/darwin/macos/10.10/packages b/profiles/prefix/darwin/macos/10.10/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.10/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.11/packages b/profiles/prefix/darwin/macos/10.11/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.12/package.unmask b/profiles/prefix/darwin/macos/10.12/package.unmask
index 92c8b2b4bee..976d5958e04 100644
--- a/profiles/prefix/darwin/macos/10.12/package.unmask
+++ b/profiles/prefix/darwin/macos/10.12/package.unmask
@@ -1,6 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# Unmask versions matching the OS profile
+sys-kernel/xnu-headers:10.12
+sys-libs/darwin-libc-headers:10.12
+
 # James Le Cuirot <chewi@gentoo.org> (2015-07-29)
 # Recent releases are supported in >10.10.
 dev-java/oracle-jdk-bin

diff --git a/profiles/prefix/darwin/macos/10.13/package.unmask b/profiles/prefix/darwin/macos/10.13/package.unmask
index 998ec0bd8b9..8d5dc6869f2 100644
--- a/profiles/prefix/darwin/macos/10.13/package.unmask
+++ b/profiles/prefix/darwin/macos/10.13/package.unmask
@@ -1,6 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# Unmask versions matching the OS profile
+sys-kernel/xnu-headers:10.13
+sys-libs/darwin-libc-headers:10.13
+
 # James Le Cuirot <chewi@gentoo.org> (2015-07-29)
 # Recent releases are supported in >10.10.
 dev-java/oracle-jdk-bin

diff --git a/profiles/prefix/darwin/macos/10.14/package.unmask b/profiles/prefix/darwin/macos/10.14/package.unmask
index 63a107ba904..d6a37a4480b 100644
--- a/profiles/prefix/darwin/macos/10.14/package.unmask
+++ b/profiles/prefix/darwin/macos/10.14/package.unmask
@@ -1,6 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# Unmask versions matching the OS profile
+sys-kernel/xnu-headers:10.14
+sys-libs/darwin-libc-headers:10.14
+
 # James Le Cuirot <chewi@gentoo.org> (2015-07-29)
 # Recent releases are supported in >10.10.
 dev-java/oracle-jdk-bin

diff --git a/profiles/prefix/darwin/macos/10.4/packages b/profiles/prefix/darwin/macos/10.4/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.4/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.5/packages b/profiles/prefix/darwin/macos/10.5/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.5/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.6/packages b/profiles/prefix/darwin/macos/10.6/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.6/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.7/packages b/profiles/prefix/darwin/macos/10.7/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.7/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.8/packages b/profiles/prefix/darwin/macos/10.8/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.8/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/10.9/packages b/profiles/prefix/darwin/macos/10.9/packages
new file mode 100644
index 00000000000..9c15af461c7
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.9/packages
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# File a bug if you need these provided for your OS version
+-*sys-kernel/xnu-headers
+-*sys-libs/darwin-libc-headers

diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index b83c55c0ced..56e44d1bdef 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
+# We mask all system headers, and only unmask the slot matching the OS
+# install in the version profiles
+sys-kernel/xnu-headers
+sys-libs/darwin-libc-headers
+
 # Fabian Groffen <grobian@gentoo.org> (2019-04-30)
 # Fails to install, bug #684030
 =dev-lang/perl-5.28.2*

diff --git a/profiles/prefix/darwin/macos/packages b/profiles/prefix/darwin/macos/packages
index a16706c6fe7..f37a922f300 100644
--- a/profiles/prefix/darwin/macos/packages
+++ b/profiles/prefix/darwin/macos/packages
@@ -1,7 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Mac OS X is built with LLVM/Clang
+# macOS has LLVM/Clang as system compiler
 -*sys-devel/gcc
 -*sys-devel/gcc-config
 *sys-devel/clang
+
+# system headers to be able to compile stuff
+*sys-kernel/xnu-headers
+*sys-libs/darwin-libc-headers


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2019-11-11 14:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-11 14:14 [gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/10.10/, profiles/prefix/darwin/macos/10.13/, Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox