summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2016-04-19 16:41:36 +0200
committerMichael Haubenwallner <haubi@gentoo.org>2016-04-20 10:22:55 +0200
commitdbda43d5c743d42aee14a9fdd2cbc04c6c985615 (patch)
tree02065fc4ca369f6c2e3a70b6ae208ddf9c46e49c
parentdev-python/enum34: Bump (diff)
downloadgentoo-dbda43d5c743d42aee14a9fdd2cbc04c6c985615.tar.gz
gentoo-dbda43d5c743d42aee14a9fdd2cbc04c6c985615.tar.bz2
gentoo-dbda43d5c743d42aee14a9fdd2cbc04c6c985615.zip
profiles: fix prefix parents, bug#574822
As the final prefix/linux profiles inherit some default/linux profile, the top-level prefix profile should not inherit the base profile. Instead, each prefix/non-linux profile can do that. This should fix bug#574822 and some related ones.
-rw-r--r--profiles/prefix/aix/parent1
-rw-r--r--profiles/prefix/bsd/parent1
-rw-r--r--profiles/prefix/darwin/parent1
-rw-r--r--profiles/prefix/hpux/parent1
-rw-r--r--profiles/prefix/parent1
-rw-r--r--profiles/prefix/sunos/parent1
-rw-r--r--profiles/prefix/windows/parent1
7 files changed, 6 insertions, 1 deletions
diff --git a/profiles/prefix/aix/parent b/profiles/prefix/aix/parent
index f3229c5b9876..cd1149221a41 100644
--- a/profiles/prefix/aix/parent
+++ b/profiles/prefix/aix/parent
@@ -1 +1,2 @@
+../../base
..
diff --git a/profiles/prefix/bsd/parent b/profiles/prefix/bsd/parent
index f3229c5b9876..cd1149221a41 100644
--- a/profiles/prefix/bsd/parent
+++ b/profiles/prefix/bsd/parent
@@ -1 +1,2 @@
+../../base
..
diff --git a/profiles/prefix/darwin/parent b/profiles/prefix/darwin/parent
index f3229c5b9876..cd1149221a41 100644
--- a/profiles/prefix/darwin/parent
+++ b/profiles/prefix/darwin/parent
@@ -1 +1,2 @@
+../../base
..
diff --git a/profiles/prefix/hpux/parent b/profiles/prefix/hpux/parent
index f3229c5b9876..cd1149221a41 100644
--- a/profiles/prefix/hpux/parent
+++ b/profiles/prefix/hpux/parent
@@ -1 +1,2 @@
+../../base
..
diff --git a/profiles/prefix/parent b/profiles/prefix/parent
index a88ecf69d275..8f0e9fd7471d 100644
--- a/profiles/prefix/parent
+++ b/profiles/prefix/parent
@@ -1,2 +1 @@
-../base
../features/prefix/rpath
diff --git a/profiles/prefix/sunos/parent b/profiles/prefix/sunos/parent
index f3229c5b9876..cd1149221a41 100644
--- a/profiles/prefix/sunos/parent
+++ b/profiles/prefix/sunos/parent
@@ -1 +1,2 @@
+../../base
..
diff --git a/profiles/prefix/windows/parent b/profiles/prefix/windows/parent
index f3229c5b9876..cd1149221a41 100644
--- a/profiles/prefix/windows/parent
+++ b/profiles/prefix/windows/parent
@@ -1 +1,2 @@
+../../base
..