diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-09-18 16:48:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-09-18 16:48:15 +0000 |
| commit | afd586f7a6499e552018b27e72c73457fd2513b7 (patch) | |
| tree | 7d04121291efccfb4fabeeb6525a099f831081f7 /sys-libs/glibc | |
| parent | dev-python/sclapp: Fix homepage URL (diff) | |
| download | gentoo-2-afd586f7a6499e552018b27e72c73457fd2513b7.tar.gz gentoo-2-afd586f7a6499e552018b27e72c73457fd2513b7.tar.bz2 gentoo-2-afd586f7a6499e552018b27e72c73457fd2513b7.zip | |
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)
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_configure.eblit | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index a724c6a09026..f297db71bb18 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1024 2014/09/17 22:53:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1025 2014/09/18 16:48:15 vapier Exp $ + + 18 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit, + files/eblits/src_configure.eblit: + Move away from has_multilib_profile and rely on USE=multilib now that the flag + should be sane across profiles #522900 by Xavier Miller. 17 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit, files/eblits/pkg_setup.eblit, files/eblits/src_test.eblit: diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index eb65d98dc87b..c42375cbe69b 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -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 @@ setup_flags() { 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 @@ foreach_abi() { 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 diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index aab777ab10e9..e0fc185761e0 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -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 @@ glibc_do_configure() { # 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 |