Gentoo Archives: gentoo-dev

From: Mike Frysinger <vapier@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] multilib profile changes wrt symlink lib
Date: Sun, 20 Mar 2011 19:28:41
Message-Id: 201103201528.00492.vapier@gentoo.org
1 i'll be moving the SYMLINK_LIB multilib handling to a subdir of the current
2 multilib set. this way we can keep the base multilib matching the upstream
3 packages, and it's easier to eventually migrate away from the symlinked
4 libdir. and merging of the mips multilib settings into the base.
5 -mike
6
7 --- arch/amd64/parent
8 +++ arch/amd64/parent
9 @@ -1,2 +1,2 @@
10 ../base
11 -../../features/multilib
12 +../../features/multilib/lib32
13 --- arch/amd64-fbsd/parent
14 +++ arch/amd64-fbsd/parent
15 @@ -1,2 +1,2 @@
16 ../base
17 -../../features/multilib
18 +../../features/multilib/lib32
19 --- arch/mips/mips64/multilib/parent
20 +++ arch/mips/mips64/multilib/parent
21 @@ -1,2 +1,2 @@
22 ..
23 -../../../../features/multilib
24 +../../../../features/multilib/lib32
25 --- arch/mips/mipsel/mips64el/multilib/parent
26 +++ arch/mips/mipsel/mips64el/multilib/parent
27 @@ -1,2 +1,2 @@
28 ..
29 -../../../../../features/multilib
30 +../../../../../features/multilib/lib32
31 --- default/linux/sparc/experimental/multilib/parent
32 +++ default/linux/sparc/experimental/multilib/parent
33 @@ -1,3 +1,3 @@
34 ..
35 ../../../../../releases/10.0
36 -../../../../../features/multilib
37 +../../../../../features/multilib/lib32
38 --- features/32bit-userland/parent
39 +++ features/32bit-userland/parent
40 @@ -1 +1 @@
41 -../multilib
42 +../multilib/lib32
43 --- features/multilib/make.defaults
44 +++ features/multilib/make.defaults
45 @@ -10,9 +10,6 @@ MULTILIB_STRICT_DIRS="/lib32 /lib /usr/l
46 MULTILIB_STRICT_DENY="64-bit.*shared object"
47 MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage)"
48
49 -# Let baselayout create the lib symlink.
50 -SYMLINK_LIB="yes"
51 -
52 # 64-bit LIBDIR
53 LIBDIR_amd64="lib64"
54 LIBDIR_amd64_fbsd="lib64"
55 @@ -20,7 +17,7 @@ LIBDIR_ppc64="lib64"
56 LIBDIR_sparc64="lib64"
57
58 # 32-bit LIBDIR
59 -LIBDIR_ppc="lib32"
60 -LIBDIR_x86="lib32"
61 -LIBDIR_x86_fbsd="lib32"
62 -LIBDIR_sparc32="lib32"
63 +LIBDIR_ppc="lib"
64 +LIBDIR_x86="lib"
65 +LIBDIR_x86_fbsd="lib"
66 +LIBDIR_sparc32="lib"
67 --- /dev/null
68 +++ features/multilib/lib32/make.defaults
69 @@ -0,0 +1,12 @@
70 +# Copyright 1999-2011 Gentoo Foundation
71 +# Distributed under the terms of the GNU General Public License v2
72 +# $Header: $
73 +
74 +# Let baselayout create the lib symlink.
75 +SYMLINK_LIB="yes"
76 +
77 +# 32-bit LIBDIR
78 +LIBDIR_ppc="lib32"
79 +LIBDIR_x86="lib32"
80 +LIBDIR_x86_fbsd="lib32"
81 +LIBDIR_sparc32="lib32"

Attachments

File name MIME type
signature.asc application/pgp-signature