summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/arch/amd64/lib32/make.defaults5
-rw-r--r--profiles/arch/amd64/lib32/parent1
-rw-r--r--profiles/arch/amd64/make.defaults5
-rw-r--r--profiles/arch/amd64/x32/make.defaults3
-rw-r--r--profiles/default/linux/amd64/13.0/parent2
-rw-r--r--profiles/default/linux/amd64/17.0/parent2
-rw-r--r--profiles/default/linux/amd64/dev/parent2
-rw-r--r--profiles/hardened/linux/amd64/parent2
8 files changed, 12 insertions, 10 deletions
diff --git a/profiles/arch/amd64/lib32/make.defaults b/profiles/arch/amd64/lib32/make.defaults
new file mode 100644
index 000000000000..19b102e42e0e
--- /dev/null
+++ b/profiles/arch/amd64/lib32/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LIBDIR_x86="lib32"
+SYMLINK_LIB="yes"
diff --git a/profiles/arch/amd64/lib32/parent b/profiles/arch/amd64/lib32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/amd64/lib32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index a9d2cc0549dc..1ca36a8d4f3d 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -18,10 +18,9 @@ DEFAULT_ABI="amd64"
ABI="amd64"
LIBDIR_amd64="lib64"
-# TODO: move this to a deprecated subprofile
-LIBDIR_x86="lib32"
+LIBDIR_x86="lib"
LIBDIR_x32="libx32"
-SYMLINK_LIB="yes"
+SYMLINK_LIB="no"
# 64bit specific settings.
CFLAGS_amd64="-m64"
diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
index 16e4a413a4cc..ad093457f3a2 100644
--- a/profiles/arch/amd64/x32/make.defaults
+++ b/profiles/arch/amd64/x32/make.defaults
@@ -5,9 +5,6 @@ DEFAULT_ABI="x32"
ABI="x32"
MULTILIB_ABIS="amd64 x86 x32"
-LIBDIR_x86="lib"
-SYMLINK_LIB="no"
-
# Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
# Default to abi_x86_x32 for packages that don't have it forced.
ABI_X86="x32"
diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent
index c88a4211ac4e..644b98fa601f 100644
--- a/profiles/default/linux/amd64/13.0/parent
+++ b/profiles/default/linux/amd64/13.0/parent
@@ -1,3 +1,3 @@
..
-../../../../arch/amd64
+../../../../arch/amd64/lib32
../../../../releases/13.0
diff --git a/profiles/default/linux/amd64/17.0/parent b/profiles/default/linux/amd64/17.0/parent
index 7d28da966e47..ddb69fdcdf84 100644
--- a/profiles/default/linux/amd64/17.0/parent
+++ b/profiles/default/linux/amd64/17.0/parent
@@ -1,3 +1,3 @@
..
-../../../../arch/amd64
+../../../../arch/amd64/lib32
../../../../releases/17.0
diff --git a/profiles/default/linux/amd64/dev/parent b/profiles/default/linux/amd64/dev/parent
index 9331107e9c45..36c90bd12373 100644
--- a/profiles/default/linux/amd64/dev/parent
+++ b/profiles/default/linux/amd64/dev/parent
@@ -1,2 +1,2 @@
..
-../../../../arch/amd64
+../../../../arch/amd64/lib32
diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
index f2e50ba2cf4e..815cf82784f9 100644
--- a/profiles/hardened/linux/amd64/parent
+++ b/profiles/hardened/linux/amd64/parent
@@ -1,4 +1,4 @@
../../../base
../../../default/linux
-../../../arch/amd64
+../../../arch/amd64/lib32
..