summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2016-04-19 16:43:08 +0200
committerMichael Haubenwallner <haubi@gentoo.org>2016-04-20 10:22:55 +0200
commit84c8a45a8dfda1218d151030f155498ca5949280 (patch)
tree4cdbb5381ca45fbab72f6e4bb6206a11e7931eec /profiles/prefix/darwin
parentprofiles: fix prefix parents, bug#574822 (diff)
downloadgentoo-84c8a45a8dfda1218d151030f155498ca5949280.tar.gz
gentoo-84c8a45a8dfda1218d151030f155498ca5949280.tar.bz2
gentoo-84c8a45a8dfda1218d151030f155498ca5949280.zip
profiles/prefix: reorder to have base first, bug#574822
As the base profile does force or mask things for the Gentoo Linux target, any Prefix specific profile should be inherited later. This applies to the final BSD, Darwin and Solaris profiles, where the arch-specific but os-version independent profile now comes just before the final profile rather than before the base profile. This also is part of bug#574822, for more natural profile inheritance.
Diffstat (limited to 'profiles/prefix/darwin')
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.4/ppc/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.4/ppc64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/parent2
19 files changed, 19 insertions, 19 deletions
diff --git a/profiles/prefix/darwin/macos/10.10/x64/parent b/profiles/prefix/darwin/macos/10.10/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/parent
+++ b/profiles/prefix/darwin/macos/10.10/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.10/x86/parent b/profiles/prefix/darwin/macos/10.10/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/parent
+++ b/profiles/prefix/darwin/macos/10.10/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.11/x64/parent b/profiles/prefix/darwin/macos/10.11/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/parent
+++ b/profiles/prefix/darwin/macos/10.11/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent b/profiles/prefix/darwin/macos/10.11/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/parent
+++ b/profiles/prefix/darwin/macos/10.11/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/parent b/profiles/prefix/darwin/macos/10.4/ppc/parent
index 6cb6381b7779..59ddeb924a6d 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.4/ppc/parent
@@ -1,2 +1,2 @@
-../../arch/ppc
..
+../../arch/ppc
diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/parent b/profiles/prefix/darwin/macos/10.4/ppc64/parent
index 4d64089b7bd3..0317d7bdb005 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc64/parent
+++ b/profiles/prefix/darwin/macos/10.4/ppc64/parent
@@ -1,2 +1,2 @@
-../../arch/ppc64
..
+../../arch/ppc64
diff --git a/profiles/prefix/darwin/macos/10.4/x86/parent b/profiles/prefix/darwin/macos/10.4/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/parent
+++ b/profiles/prefix/darwin/macos/10.4/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/parent b/profiles/prefix/darwin/macos/10.5/ppc/parent
index 6cb6381b7779..59ddeb924a6d 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc/parent
@@ -1,2 +1,2 @@
-../../arch/ppc
..
+../../arch/ppc
diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/parent b/profiles/prefix/darwin/macos/10.5/ppc64/parent
index 4d64089b7bd3..0317d7bdb005 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc64/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc64/parent
@@ -1,2 +1,2 @@
-../../arch/ppc64
..
+../../arch/ppc64
diff --git a/profiles/prefix/darwin/macos/10.5/x64/parent b/profiles/prefix/darwin/macos/10.5/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/parent
+++ b/profiles/prefix/darwin/macos/10.5/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.5/x86/parent b/profiles/prefix/darwin/macos/10.5/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/parent
+++ b/profiles/prefix/darwin/macos/10.5/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.6/x64/parent b/profiles/prefix/darwin/macos/10.6/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/parent
+++ b/profiles/prefix/darwin/macos/10.6/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.6/x86/parent b/profiles/prefix/darwin/macos/10.6/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/parent
+++ b/profiles/prefix/darwin/macos/10.6/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.7/x64/parent b/profiles/prefix/darwin/macos/10.7/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/parent
+++ b/profiles/prefix/darwin/macos/10.7/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.7/x86/parent b/profiles/prefix/darwin/macos/10.7/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/parent
+++ b/profiles/prefix/darwin/macos/10.7/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.8/x64/parent b/profiles/prefix/darwin/macos/10.8/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/parent
+++ b/profiles/prefix/darwin/macos/10.8/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.8/x86/parent b/profiles/prefix/darwin/macos/10.8/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/parent
+++ b/profiles/prefix/darwin/macos/10.8/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.9/x64/parent b/profiles/prefix/darwin/macos/10.9/x64/parent
index fc24616eeda4..269f6f48bb15 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/parent
+++ b/profiles/prefix/darwin/macos/10.9/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.9/x86/parent b/profiles/prefix/darwin/macos/10.9/x86/parent
index 4a6aa36b18d9..93220d096824 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/parent
+++ b/profiles/prefix/darwin/macos/10.9/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
..
+../../arch/x86