| 1 |
--- |
| 2 |
profiles/arch/amd64/make.defaults | 2 ++ |
| 3 |
profiles/arch/amd64/x32/make.defaults | 3 ++- |
| 4 |
profiles/arch/amd64/x32/parent | 1 - |
| 5 |
profiles/arch/arm64/make.defaults | 2 ++ |
| 6 |
profiles/arch/powerpc/make.defaults | 3 --- |
| 7 |
profiles/arch/s390/make.defaults | 5 ++++- |
| 8 |
.../sparc/experimental/multilib/make.defaults | 1 + |
| 9 |
profiles/features/multilib/make.defaults | 24 +--------------------- |
| 10 |
8 files changed, 12 insertions(+), 29 deletions(-) |
| 11 |
delete mode 100644 profiles/arch/powerpc/make.defaults |
| 12 |
|
| 13 |
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults |
| 14 |
index 0049d67bce78..807790c710d3 100644 |
| 15 |
--- a/profiles/arch/amd64/make.defaults |
| 16 |
+++ b/profiles/arch/amd64/make.defaults |
| 17 |
@@ -18,8 +18,10 @@ DEFAULT_ABI="amd64" |
| 18 |
# Do not remove this one, or all kinds of hell breaks loose. |
| 19 |
ABI="amd64" |
| 20 |
|
| 21 |
+LIBDIR_amd64="lib64" |
| 22 |
# TODO: move this to a deprecated subprofile |
| 23 |
LIBDIR_x86="lib32" |
| 24 |
+LIBDIR_x32="libx32" |
| 25 |
SYMLINK_LIB="yes" |
| 26 |
|
| 27 |
# 64bit specific settings. |
| 28 |
diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults |
| 29 |
index d06c616b15fa..c6c6c90d74ec 100644 |
| 30 |
--- a/profiles/arch/amd64/x32/make.defaults |
| 31 |
+++ b/profiles/arch/amd64/x32/make.defaults |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2014 Gentoo Foundation |
| 34 |
+# Copyright 1999-2017 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
# $Id$ |
| 37 |
|
| 38 |
@@ -6,6 +6,7 @@ DEFAULT_ABI="x32" |
| 39 |
ABI="x32" |
| 40 |
MULTILIB_ABIS="amd64 x86 x32" |
| 41 |
|
| 42 |
+LIBDIR_x86="lib" |
| 43 |
SYMLINK_LIB="no" |
| 44 |
|
| 45 |
# Michał Górny <mgorny@g.o> (01 Jul 2014) |
| 46 |
diff --git a/profiles/arch/amd64/x32/parent b/profiles/arch/amd64/x32/parent |
| 47 |
index 6ee1b9eff10c..f3229c5b9876 100644 |
| 48 |
--- a/profiles/arch/amd64/x32/parent |
| 49 |
+++ b/profiles/arch/amd64/x32/parent |
| 50 |
@@ -1,2 +1 @@ |
| 51 |
.. |
| 52 |
-../../../features/multilib |
| 53 |
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults |
| 54 |
index 6a75c191a621..20318a45380b 100644 |
| 55 |
--- a/profiles/arch/arm64/make.defaults |
| 56 |
+++ b/profiles/arch/arm64/make.defaults |
| 57 |
@@ -12,5 +12,7 @@ CXXFLAGS="${CFLAGS}" |
| 58 |
FFLAGS="${CFLAGS}" |
| 59 |
FCFLAGS="${CFLAGS}" |
| 60 |
|
| 61 |
+LIBDIR_arm64="lib64" |
| 62 |
+ |
| 63 |
# Defaults for video drivers |
| 64 |
VIDEO_CARDS="fbdev" |
| 65 |
diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults |
| 66 |
deleted file mode 100644 |
| 67 |
index 445a68b5ea0f..000000000000 |
| 68 |
--- a/profiles/arch/powerpc/make.defaults |
| 69 |
+++ /dev/null |
| 70 |
@@ -1,3 +0,0 @@ |
| 71 |
-# Copyright 1999-2015 Gentoo Foundation |
| 72 |
-# Distributed under the terms of the GNU General Public License v2 |
| 73 |
-# $Id$ |
| 74 |
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults |
| 75 |
index aa7b92133fb3..a4076b2adfc1 100644 |
| 76 |
--- a/profiles/arch/s390/make.defaults |
| 77 |
+++ b/profiles/arch/s390/make.defaults |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2014 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
# $Id$ |
| 83 |
|
| 84 |
@@ -15,6 +15,9 @@ CXXFLAGS="${CFLAGS}" |
| 85 |
FFLAGS="${CFLAGS}" |
| 86 |
FCFLAGS="${CFLAGS}" |
| 87 |
|
| 88 |
+LIBDIR_s390x="lib64" |
| 89 |
+LIBDIR_s390="lib" |
| 90 |
+ |
| 91 |
INPUT_DEVICES="void" |
| 92 |
VIDEO_CARDS="dummy" |
| 93 |
|
| 94 |
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults |
| 95 |
index c8bad628fd9a..85bff4ebd437 100644 |
| 96 |
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults |
| 97 |
+++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults |
| 98 |
@@ -13,3 +13,4 @@ FEATURES="userpriv" |
| 99 |
CFLAGS_sparc64="-m64" |
| 100 |
|
| 101 |
LIBDIR_sparc32="lib32" |
| 102 |
+LIBDIR_sparc64="lib64" |
| 103 |
diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults |
| 104 |
index 72248e2390ef..2e201e35d31a 100644 |
| 105 |
--- a/profiles/features/multilib/make.defaults |
| 106 |
+++ b/profiles/features/multilib/make.defaults |
| 107 |
@@ -1,4 +1,4 @@ |
| 108 |
-# Copyright 1999-2013 Gentoo Foundation |
| 109 |
+# Copyright 1999-2017 Gentoo Foundation |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
# $Id$ |
| 112 |
|
| 113 |
@@ -15,25 +15,3 @@ USE="multilib" |
| 114 |
MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib" |
| 115 |
MULTILIB_STRICT_DENY="64-bit.*shared object" |
| 116 |
MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev|systemd|clang|python-exec)" |
| 117 |
- |
| 118 |
-# 64-bit LIBDIR |
| 119 |
-LIBDIR_amd64="lib64" |
| 120 |
-LIBDIR_amd64_fbsd="lib64" |
| 121 |
-LIBDIR_arm64="lib64" |
| 122 |
-LIBDIR_n64="lib64" # MIPS n64 |
| 123 |
-LIBDIR_ppc64="lib64" |
| 124 |
-LIBDIR_s390x="lib64" |
| 125 |
-LIBDIR_sparc64="lib64" |
| 126 |
- |
| 127 |
-# 32-bit LIBDIR |
| 128 |
-LIBDIR_arm="lib" |
| 129 |
-LIBDIR_x86="lib" |
| 130 |
-LIBDIR_x86_fbsd="lib" |
| 131 |
-LIBDIR_o32="lib" # MIPS o32 |
| 132 |
-LIBDIR_ppc="lib" |
| 133 |
-LIBDIR_s390="lib" |
| 134 |
-LIBDIR_sparc32="lib" |
| 135 |
- |
| 136 |
-# Somewhere in-between! |
| 137 |
-LIBDIR_x32="libx32" # x86-64 x32 |
| 138 |
-LIBDIR_n32="lib32" # MIPS n32 |
| 139 |
-- |
| 140 |
2.11.0 |
Archives