Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/, profiles/arch/amd64/x32/, profiles/features/multilib/, ...
Date: Wed, 01 Feb 2017 12:27:39
Message-Id: 1485952030.4ab0a72740a3c4bf55c479a7389d91966ebb95ea.mgorny@gentoo
1 commit: 4ab0a72740a3c4bf55c479a7389d91966ebb95ea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 21 16:58:16 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 12:27:10 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab0a727
7
8 profiles: Move LIBDIR_* declarations into specific arches
9
10 profiles/arch/amd64/make.defaults | 2 ++
11 profiles/arch/amd64/x32/make.defaults | 3 ++-
12 profiles/arch/amd64/x32/parent | 1 -
13 profiles/arch/arm64/make.defaults | 2 ++
14 profiles/arch/powerpc/make.defaults | 3 ---
15 profiles/arch/s390/make.defaults | 5 ++++-
16 .../sparc/experimental/multilib/make.defaults | 1 +
17 profiles/features/multilib/make.defaults | 24 +---------------------
18 8 files changed, 12 insertions(+), 29 deletions(-)
19
20 diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
21 index 140fa0b..69d09ab 100644
22 --- a/profiles/arch/amd64/make.defaults
23 +++ b/profiles/arch/amd64/make.defaults
24 @@ -18,8 +18,10 @@ DEFAULT_ABI="amd64"
25 # Do not remove this one, or all kinds of hell breaks loose.
26 ABI="amd64"
27
28 +LIBDIR_amd64="lib64"
29 # TODO: move this to a deprecated subprofile
30 LIBDIR_x86="lib32"
31 +LIBDIR_x32="libx32"
32 SYMLINK_LIB="yes"
33
34 # 64bit specific settings.
35
36 diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
37 index d06c616..c6c6c90 100644
38 --- a/profiles/arch/amd64/x32/make.defaults
39 +++ b/profiles/arch/amd64/x32/make.defaults
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2014 Gentoo Foundation
42 +# Copyright 1999-2017 Gentoo Foundation
43 # Distributed under the terms of the GNU General Public License v2
44 # $Id$
45
46 @@ -6,6 +6,7 @@ DEFAULT_ABI="x32"
47 ABI="x32"
48 MULTILIB_ABIS="amd64 x86 x32"
49
50 +LIBDIR_x86="lib"
51 SYMLINK_LIB="no"
52
53 # Michał Górny <mgorny@g.o> (01 Jul 2014)
54
55 diff --git a/profiles/arch/amd64/x32/parent b/profiles/arch/amd64/x32/parent
56 index 6ee1b9e..f3229c5b 100644
57 --- a/profiles/arch/amd64/x32/parent
58 +++ b/profiles/arch/amd64/x32/parent
59 @@ -1,2 +1 @@
60 ..
61 -../../../features/multilib
62
63 diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
64 index 6a75c19..20318a4 100644
65 --- a/profiles/arch/arm64/make.defaults
66 +++ b/profiles/arch/arm64/make.defaults
67 @@ -12,5 +12,7 @@ CXXFLAGS="${CFLAGS}"
68 FFLAGS="${CFLAGS}"
69 FCFLAGS="${CFLAGS}"
70
71 +LIBDIR_arm64="lib64"
72 +
73 # Defaults for video drivers
74 VIDEO_CARDS="fbdev"
75
76 diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults
77 deleted file mode 100644
78 index 445a68b..00000000
79 --- a/profiles/arch/powerpc/make.defaults
80 +++ /dev/null
81 @@ -1,3 +0,0 @@
82 -# Copyright 1999-2015 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -# $Id$
85
86 diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
87 index aa7b921..a4076b2 100644
88 --- a/profiles/arch/s390/make.defaults
89 +++ b/profiles/arch/s390/make.defaults
90 @@ -1,4 +1,4 @@
91 -# Copyright 1999-2014 Gentoo Foundation
92 +# Copyright 1999-2017 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94 # $Id$
95
96 @@ -15,6 +15,9 @@ CXXFLAGS="${CFLAGS}"
97 FFLAGS="${CFLAGS}"
98 FCFLAGS="${CFLAGS}"
99
100 +LIBDIR_s390x="lib64"
101 +LIBDIR_s390="lib"
102 +
103 INPUT_DEVICES="void"
104 VIDEO_CARDS="dummy"
105
106
107 diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults
108 index c8bad62..85bff4e 100644
109 --- a/profiles/default/linux/sparc/experimental/multilib/make.defaults
110 +++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults
111 @@ -13,3 +13,4 @@ FEATURES="userpriv"
112 CFLAGS_sparc64="-m64"
113
114 LIBDIR_sparc32="lib32"
115 +LIBDIR_sparc64="lib64"
116
117 diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults
118 index 72248e2..2e201e3 100644
119 --- a/profiles/features/multilib/make.defaults
120 +++ b/profiles/features/multilib/make.defaults
121 @@ -1,4 +1,4 @@
122 -# Copyright 1999-2013 Gentoo Foundation
123 +# Copyright 1999-2017 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 # $Id$
126
127 @@ -15,25 +15,3 @@ USE="multilib"
128 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"
129 MULTILIB_STRICT_DENY="64-bit.*shared object"
130 MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev|systemd|clang|python-exec)"
131 -
132 -# 64-bit LIBDIR
133 -LIBDIR_amd64="lib64"
134 -LIBDIR_amd64_fbsd="lib64"
135 -LIBDIR_arm64="lib64"
136 -LIBDIR_n64="lib64" # MIPS n64
137 -LIBDIR_ppc64="lib64"
138 -LIBDIR_s390x="lib64"
139 -LIBDIR_sparc64="lib64"
140 -
141 -# 32-bit LIBDIR
142 -LIBDIR_arm="lib"
143 -LIBDIR_x86="lib"
144 -LIBDIR_x86_fbsd="lib"
145 -LIBDIR_o32="lib" # MIPS o32
146 -LIBDIR_ppc="lib"
147 -LIBDIR_s390="lib"
148 -LIBDIR_sparc32="lib"
149 -
150 -# Somewhere in-between!
151 -LIBDIR_x32="libx32" # x86-64 x32
152 -LIBDIR_n32="lib32" # MIPS n32
Report Message
Find on MARC Find on Google Groups