vapier 14/09/18 16:48:15 Modified: common.eblit src_configure.eblit Log: Move away from has_multilib_profile and rely on USE=multilib now that the flag should be sane across profiles #522900 by Xavier Miller. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.43 sys-libs/glibc/files/eblits/common.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.43&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.43&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.42&r2=1.43 Index: common.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- common.eblit 17 Sep 2014 22:53:43 -0000 1.42 +++ common.eblit 18 Sep 2014 16:48:15 -0000 1.43 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.42 2014/09/17 22:53:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.43 2014/09/18 16:48:15 vapier Exp $ alt_prefix() { is_crosscompile && echo /usr/${CTARGET} @@ -169,7 +169,7 @@ filter-flags -frecord-gcc-switches unset CBUILD_OPT CTARGET_OPT - if has_multilib_profile ; then + if use multilib ; then CTARGET_OPT=$(get_abi_CTARGET) [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) fi @@ -310,9 +310,9 @@ local ret=0 local abilist="" - if has_multilib_profile ; then + if use multilib ; then abilist=$(get_install_abis) - elif is_crosscompile || tc-is-cross-compiler ; then + else abilist=${DEFAULT_ABI} fi evar_push ABI 1.2 sys-libs/glibc/files/eblits/src_configure.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit?r1=1.1&r2=1.2 Index: src_configure.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- src_configure.eblit 10 Sep 2014 18:45:21 -0000 1.1 +++ src_configure.eblit 18 Sep 2014 16:48:15 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.1 2014/09/10 18:45:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.2 2014/09/18 16:48:15 vapier Exp $ dump_toolchain_settings() { echo @@ -78,7 +78,7 @@ # 2. only for the primary ABI on multilib systems # 3. Not a crosscompile if ! is_crosscompile && use selinux ; then - if use multilib || has_multilib_profile ; then + if use multilib ; then if is_final_abi ; then myconf+=( --with-selinux ) else
