diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-07-03 08:27:01 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-07-03 08:27:01 +0000 |
| commit | d8b290b2cdd1414db3b4ee344211aa45f2251ffd (patch) | |
| tree | e5057930bbe523924eeb44002af027d99ab5fbca /eclass | |
| parent | Removed some orphaned patch. (diff) | |
| download | gentoo-2-d8b290b2cdd1414db3b4ee344211aa45f2251ffd.tar.gz gentoo-2-d8b290b2cdd1414db3b4ee344211aa45f2251ffd.tar.bz2 gentoo-2-d8b290b2cdd1414db3b4ee344211aa45f2251ffd.zip | |
Explain MULTILIB_COMPAT a bit more verbosely, and add a REQUIRED_USE for it.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 49319b5efdd3..e169773f7bcb 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1307 2014/07/03 07:48:49 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1308 2014/07/03 08:27:01 mgorny Exp $ + + 03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Explain MULTILIB_COMPAT a bit more verbosely, and add a REQUIRED_USE for it. 03 Jul 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Re-enable multilib flags for s390. diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 3365b4e1d588..94a6db401bd0 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -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/eclass/multilib-build.eclass,v 1.60 2014/07/03 07:48:49 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.61 2014/07/03 08:27:01 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -58,8 +58,15 @@ _MULTILIB_FLAGS=( # # This variable is intended for use in prebuilt multilib packages that # can provide binaries only for a limited set of ABIs. If ABIs need to -# be limited due to a bug in source code, package.use.mask is -# recommended instead. +# be limited due to a bug in source code, package.use.mask is to be used +# instead. Along with MULTILIB_COMPAT, KEYWORDS should contain '-*'. +# +# Note that setting this variable effectively disables support for all +# other ABIs, including other architectures. For example, specifying +# abi_x86_{32,64} disables support for MIPS as well. +# +# The value of MULTILIB_COMPAT determines the value of IUSE. If set, it +# also enables REQUIRED_USE constraints. # # Example use: # @CODE @@ -114,6 +121,8 @@ _multilib_build_set_globals() { local usedeps=${flags[@]/%/(-)?} IUSE=${flags[*]} + REQUIRED_USE="|| ( ${flags[*]} )" + MULTILIB_USEDEP=${usedeps// /,} } _multilib_build_set_globals |