| 1 |
NFC except for effective LIBDIR_* for architectures irrelevant to |
| 2 |
the profile at hand. |
| 3 |
--- |
| 4 |
profiles/arch/amd64-fbsd/make.defaults | 3 ++- |
| 5 |
profiles/arch/amd64-fbsd/parent | 2 +- |
| 6 |
profiles/arch/amd64/make.defaults | 6 +++++- |
| 7 |
profiles/arch/amd64/parent | 2 +- |
| 8 |
.../default/linux/sparc/experimental/multilib/make.defaults | 4 +++- |
| 9 |
profiles/default/linux/sparc/experimental/multilib/parent | 2 +- |
| 10 |
profiles/features/multilib/lib32/eapi | 1 - |
| 11 |
profiles/features/multilib/lib32/make.defaults | 13 ------------- |
| 12 |
profiles/features/multilib/lib32/parent | 1 - |
| 13 |
9 files changed, 13 insertions(+), 21 deletions(-) |
| 14 |
delete mode 100644 profiles/features/multilib/lib32/eapi |
| 15 |
delete mode 100644 profiles/features/multilib/lib32/make.defaults |
| 16 |
delete mode 100644 profiles/features/multilib/lib32/parent |
| 17 |
|
| 18 |
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults |
| 19 |
index 42329af60819..b2170df430f0 100644 |
| 20 |
--- a/profiles/arch/amd64-fbsd/make.defaults |
| 21 |
+++ b/profiles/arch/amd64-fbsd/make.defaults |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation. |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation. |
| 25 |
# Distributed under the terms of the GNU General Public License, v2 |
| 26 |
# $Id$ |
| 27 |
# System-wide defaults for the G/FBSD Portage system |
| 28 |
@@ -32,6 +32,7 @@ VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \ |
| 29 |
# distros. |
| 30 |
# Adjust multilib dirs for multilib-strict. |
| 31 |
LIBDIR_amd64_fbsd="lib" |
| 32 |
+LIBDIR_x86_fbsd="lib32" |
| 33 |
MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32" |
| 34 |
SYMLINK_LIB="no" |
| 35 |
|
| 36 |
diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent |
| 37 |
index db3aa68cdfc0..014611b2535c 100644 |
| 38 |
--- a/profiles/arch/amd64-fbsd/parent |
| 39 |
+++ b/profiles/arch/amd64-fbsd/parent |
| 40 |
@@ -1,3 +1,3 @@ |
| 41 |
../base |
| 42 |
-../../features/multilib/lib32 |
| 43 |
+../../features/multilib |
| 44 |
todo |
| 45 |
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults |
| 46 |
index 96a6803f351a..0049d67bce78 100644 |
| 47 |
--- a/profiles/arch/amd64/make.defaults |
| 48 |
+++ b/profiles/arch/amd64/make.defaults |
| 49 |
@@ -1,4 +1,4 @@ |
| 50 |
-# Copyright 1999-2015 Gentoo Foundation |
| 51 |
+# Copyright 1999-2017 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Id$ |
| 54 |
|
| 55 |
@@ -18,6 +18,10 @@ DEFAULT_ABI="amd64" |
| 56 |
# Do not remove this one, or all kinds of hell breaks loose. |
| 57 |
ABI="amd64" |
| 58 |
|
| 59 |
+# TODO: move this to a deprecated subprofile |
| 60 |
+LIBDIR_x86="lib32" |
| 61 |
+SYMLINK_LIB="yes" |
| 62 |
+ |
| 63 |
# 64bit specific settings. |
| 64 |
CFLAGS_amd64="-m64" |
| 65 |
LDFLAGS_amd64="-m elf_x86_64" |
| 66 |
diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent |
| 67 |
index d8d1efff8456..c5b66f7e9c9c 100644 |
| 68 |
--- a/profiles/arch/amd64/parent |
| 69 |
+++ b/profiles/arch/amd64/parent |
| 70 |
@@ -1,2 +1,2 @@ |
| 71 |
../base |
| 72 |
-../../features/multilib/lib32 |
| 73 |
+../../features/multilib |
| 74 |
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults |
| 75 |
index e7aebfdaa360..c8bad628fd9a 100644 |
| 76 |
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults |
| 77 |
+++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2008 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
# $Id$ |
| 83 |
|
| 84 |
@@ -11,3 +11,5 @@ FEATURES="userpriv" |
| 85 |
# can't set this in the top level make.defaults as it breaks |
| 86 |
# sys-kernel/linux-headers for non-multilib profiles |
| 87 |
CFLAGS_sparc64="-m64" |
| 88 |
+ |
| 89 |
+LIBDIR_sparc32="lib32" |
| 90 |
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent |
| 91 |
index 7607023366ad..04ec01cf0979 100644 |
| 92 |
--- a/profiles/default/linux/sparc/experimental/multilib/parent |
| 93 |
+++ b/profiles/default/linux/sparc/experimental/multilib/parent |
| 94 |
@@ -1,3 +1,3 @@ |
| 95 |
.. |
| 96 |
../../../../../releases/13.0 |
| 97 |
-../../../../../features/multilib/lib32 |
| 98 |
+../../../../../features/multilib |
| 99 |
diff --git a/profiles/features/multilib/lib32/eapi b/profiles/features/multilib/lib32/eapi |
| 100 |
deleted file mode 100644 |
| 101 |
index 7ed6ff82de6b..000000000000 |
| 102 |
--- a/profiles/features/multilib/lib32/eapi |
| 103 |
+++ /dev/null |
| 104 |
@@ -1 +0,0 @@ |
| 105 |
-5 |
| 106 |
diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults |
| 107 |
deleted file mode 100644 |
| 108 |
index b3ab33c98e43..000000000000 |
| 109 |
--- a/profiles/features/multilib/lib32/make.defaults |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,13 +0,0 @@ |
| 112 |
-# Copyright 1999-2011 Gentoo Foundation |
| 113 |
-# Distributed under the terms of the GNU General Public License v2 |
| 114 |
-# $Id$ |
| 115 |
- |
| 116 |
-# Let baselayout create the lib symlink. |
| 117 |
-SYMLINK_LIB="yes" |
| 118 |
- |
| 119 |
-# 32-bit LIBDIR |
| 120 |
-LIBDIR_ppc="lib32" |
| 121 |
-LIBDIR_x86="lib32" |
| 122 |
-LIBDIR_x86_fbsd="lib32" |
| 123 |
-LIBDIR_sparc32="lib32" |
| 124 |
-LIBDIR_s390="lib32" |
| 125 |
diff --git a/profiles/features/multilib/lib32/parent b/profiles/features/multilib/lib32/parent |
| 126 |
deleted file mode 100644 |
| 127 |
index f3229c5b9876..000000000000 |
| 128 |
--- a/profiles/features/multilib/lib32/parent |
| 129 |
+++ /dev/null |
| 130 |
@@ -1 +0,0 @@ |
| 131 |
-.. |
| 132 |
-- |
| 133 |
2.11.0 |
Archives