Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: kingtaco@g.o, amd64@g.o, devrel@g.o, x11@g.o
Subject: Re: [gentoo-dev] Re: [PATCH 2/2] Use new multilib flags in autotools-multilib.
Date: Thu, 24 Jan 2013 21:15:09
Message-Id: 20130124221533.64f5d8a9@pomiocik.lan
In Reply to: [gentoo-dev] Re: [PATCH 2/2] Use new multilib flags in autotools-multilib. by Mike Doty
1 -----BEGIN PGP SIGNED MESSAGE-----
2 Hash: SHA256
3
4 On Thu, 24 Jan 2013 09:25:48 -0800
5 Mike Doty <kingtaco@g.o> wrote:
6
7 > -----BEGIN PGP SIGNED MESSAGE-----
8 > Hash: SHA1
9 >
10 > On 01/23/13 15:23, Michał Górny wrote:
11 > > This is mostly a proof-of-concept. If approved, I will work on moving
12 > > the code into a separate eclass, possibly named 'multilib-build' ;).
13 > > ---
14 > > gx86/eclass/autotools-multilib.eclass | 24 +++++++++++++++++++++---
15 > > 1 file changed, 21 insertions(+), 3 deletions(-)
16 > >
17 > > diff --git a/gx86/eclass/autotools-multilib.eclass b/gx86/eclass/autotools-multilib.eclass
18 > > index 7c8697a..eef7bcc 100644
19 > > --- a/gx86/eclass/autotools-multilib.eclass
20 > > +++ b/gx86/eclass/autotools-multilib.eclass
21 > > @@ -32,7 +32,23 @@ inherit autotools-utils multilib
22 > >
23 > > EXPORT_FUNCTIONS src_configure src_compile src_test src_install
24 > >
25 > > -IUSE=multilib
26 > > +# Declare all of them, profiles will control their visibility.
27 > > +IUSE='abi_x86_32 abi_x86_64'
28 > > +
29 > > +# @FUNCTION: _autotools-multilib_get_enabled_abis
30 > > +# @DESCRIPTION:
31 > > +# Get the list of enabled ABIs. The returned names are suitable for use
32 > > +# with multilib.eclass.
33 > > +#
34 > > +# If multilib is not enabled or not supported, returns an empty list.
35 > > +_autotools-multilib_get_enabled_abis() {
36 > > + debug-print-function ${FUNCNAME} "${@}"
37 > > +
38 > > + if use amd64; then
39 > > + use abi_x86_64 && echo amd64
40 > > + use abi_x86_32 && echo x86
41 > > + fi
42 > > +}
43 > >
44 > > # @FUNCTION: autotools-multilib_foreach_abi
45 > > # @USAGE: argv...
46 > > @@ -46,9 +62,11 @@ IUSE=multilib
47 > > autotools-multilib_foreach_abi() {
48 > > local initial_dir=${BUILD_DIR:-${S}}
49 > >
50 > > - if use multilib; then
51 > > + local multilib_abis=$(_autotools-multilib_get_enabled_abis)
52 > > +
53 > > + if [[ ${multilib_abis} ]]; then
54 > > local ABI
55 > > - for ABI in $(get_all_abis); do
56 > > + for ABI in ${multilib_abis}; do
57 > > multilib_toolchain_setup "${ABI}"
58 > > BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
59 > > done
60 > >
61 > Why CC devrel on this?
62
63 Oops, sorry. I meant to CC releng...
64
65 - --
66 Best regards,
67 Michał Górny
68 -----BEGIN PGP SIGNATURE-----
69 Version: GnuPG v2.0.19 (GNU/Linux)
70
71 iJwEAQEIAAYFAlEBpHoACgkQfXuS5UK5QB2znQP/YTR6zos9ATcaXSjoo1+bhiVl
72 tSpvNXGDRmYEIVGWdW7831oTd1/5bazGaoALnC5Y8iURblI8MUENv7xx4u9RQnQb
73 okIKHLXWFsirMrx3XAs0nTbRotZxFZY00N93mhYHYGjg4l0bnsIVCQC6dBpHLKRX
74 wMUEF2WjATT0ACxgyos=
75 =qTSP
76 -----END PGP SIGNATURE-----