1 |
commit: 74c1593b105fe120798e1a3730437082a34ac53e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 21 13:21:16 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 1 12:27:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c1593b |
7 |
|
8 |
profiles: Inline features/multilib/lib32 |
9 |
|
10 |
NFC except for effective LIBDIR_* for architectures irrelevant to |
11 |
the profile at hand. |
12 |
|
13 |
profiles/arch/amd64-fbsd/make.defaults | 1 + |
14 |
profiles/arch/amd64-fbsd/parent | 2 +- |
15 |
profiles/arch/amd64/make.defaults | 4 ++++ |
16 |
profiles/arch/amd64/parent | 2 +- |
17 |
.../default/linux/sparc/experimental/multilib/make.defaults | 4 +++- |
18 |
profiles/default/linux/sparc/experimental/multilib/parent | 2 +- |
19 |
profiles/features/multilib/lib32/eapi | 1 - |
20 |
profiles/features/multilib/lib32/make.defaults | 13 ------------- |
21 |
profiles/features/multilib/lib32/parent | 1 - |
22 |
9 files changed, 11 insertions(+), 19 deletions(-) |
23 |
|
24 |
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults |
25 |
index 432f774..36e84de2 100644 |
26 |
--- a/profiles/arch/amd64-fbsd/make.defaults |
27 |
+++ b/profiles/arch/amd64-fbsd/make.defaults |
28 |
@@ -31,6 +31,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 |
|
37 |
diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent |
38 |
index db3aa68..014611b 100644 |
39 |
--- a/profiles/arch/amd64-fbsd/parent |
40 |
+++ b/profiles/arch/amd64-fbsd/parent |
41 |
@@ -1,3 +1,3 @@ |
42 |
../base |
43 |
-../../features/multilib/lib32 |
44 |
+../../features/multilib |
45 |
todo |
46 |
|
47 |
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults |
48 |
index df7976d..140fa0b 100644 |
49 |
--- a/profiles/arch/amd64/make.defaults |
50 |
+++ b/profiles/arch/amd64/make.defaults |
51 |
@@ -18,6 +18,10 @@ DEFAULT_ABI="amd64" |
52 |
# Do not remove this one, or all kinds of hell breaks loose. |
53 |
ABI="amd64" |
54 |
|
55 |
+# TODO: move this to a deprecated subprofile |
56 |
+LIBDIR_x86="lib32" |
57 |
+SYMLINK_LIB="yes" |
58 |
+ |
59 |
# 64bit specific settings. |
60 |
CFLAGS_amd64="-m64" |
61 |
LDFLAGS_amd64="-m elf_x86_64" |
62 |
|
63 |
diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent |
64 |
index d8d1eff..c5b66f7 100644 |
65 |
--- a/profiles/arch/amd64/parent |
66 |
+++ b/profiles/arch/amd64/parent |
67 |
@@ -1,2 +1,2 @@ |
68 |
../base |
69 |
-../../features/multilib/lib32 |
70 |
+../../features/multilib |
71 |
|
72 |
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults |
73 |
index e7aebfd..c8bad62 100644 |
74 |
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults |
75 |
+++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults |
76 |
@@ -1,4 +1,4 @@ |
77 |
-# Copyright 1999-2008 Gentoo Foundation |
78 |
+# Copyright 1999-2017 Gentoo Foundation |
79 |
# Distributed under the terms of the GNU General Public License v2 |
80 |
# $Id$ |
81 |
|
82 |
@@ -11,3 +11,5 @@ FEATURES="userpriv" |
83 |
# can't set this in the top level make.defaults as it breaks |
84 |
# sys-kernel/linux-headers for non-multilib profiles |
85 |
CFLAGS_sparc64="-m64" |
86 |
+ |
87 |
+LIBDIR_sparc32="lib32" |
88 |
|
89 |
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent |
90 |
index 7607023..04ec01c 100644 |
91 |
--- a/profiles/default/linux/sparc/experimental/multilib/parent |
92 |
+++ b/profiles/default/linux/sparc/experimental/multilib/parent |
93 |
@@ -1,3 +1,3 @@ |
94 |
.. |
95 |
../../../../../releases/13.0 |
96 |
-../../../../../features/multilib/lib32 |
97 |
+../../../../../features/multilib |
98 |
|
99 |
diff --git a/profiles/features/multilib/lib32/eapi b/profiles/features/multilib/lib32/eapi |
100 |
deleted file mode 100644 |
101 |
index 7ed6ff8..00000000 |
102 |
--- a/profiles/features/multilib/lib32/eapi |
103 |
+++ /dev/null |
104 |
@@ -1 +0,0 @@ |
105 |
-5 |
106 |
|
107 |
diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults |
108 |
deleted file mode 100644 |
109 |
index b3ab33c..00000000 |
110 |
--- a/profiles/features/multilib/lib32/make.defaults |
111 |
+++ /dev/null |
112 |
@@ -1,13 +0,0 @@ |
113 |
-# Copyright 1999-2011 Gentoo Foundation |
114 |
-# Distributed under the terms of the GNU General Public License v2 |
115 |
-# $Id$ |
116 |
- |
117 |
-# Let baselayout create the lib symlink. |
118 |
-SYMLINK_LIB="yes" |
119 |
- |
120 |
-# 32-bit LIBDIR |
121 |
-LIBDIR_ppc="lib32" |
122 |
-LIBDIR_x86="lib32" |
123 |
-LIBDIR_x86_fbsd="lib32" |
124 |
-LIBDIR_sparc32="lib32" |
125 |
-LIBDIR_s390="lib32" |
126 |
|
127 |
diff --git a/profiles/features/multilib/lib32/parent b/profiles/features/multilib/lib32/parent |
128 |
deleted file mode 100644 |
129 |
index f3229c5b..00000000 |
130 |
--- a/profiles/features/multilib/lib32/parent |
131 |
+++ /dev/null |
132 |
@@ -1 +0,0 @@ |
133 |
-.. |