diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-23 17:11:10 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-23 17:11:10 +0000 |
| commit | 0036ae73c8c9555b3d2538af363f70c696dd11e9 (patch) | |
| tree | 2bcb4b527cb1e11740cd0e4b806e6fdc6237c740 /eclass | |
| parent | version bump; improvements to book editor and various bug fixes; remove old (diff) | |
| download | gentoo-2-0036ae73c8c9555b3d2538af363f70c696dd11e9.tar.gz gentoo-2-0036ae73c8c9555b3d2538af363f70c696dd11e9.tar.bz2 gentoo-2-0036ae73c8c9555b3d2538af363f70c696dd11e9.zip | |
Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules and PATH separator.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ba372373abc7..2624d2e37304 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1270 2014/05/23 07:53:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1271 2014/05/23 17:11:10 mgorny Exp $ + + 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules + and PATH separator. 23 May 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Add remaining potential multilib arches to header wrapping template. diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index c45cc9de0235..128f1ae2f313 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.53 2014/05/23 07:53:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.54 2014/05/23 17:11:10 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -130,7 +130,7 @@ multilib_get_enabled_abis() { # @FUNCTION: multilib_get_enabled_abi_pairs # @DESCRIPTION: -# Return the ordered list of enabled <use-flag>:<ABI> pairs +# Return the ordered list of enabled <use-flag>.<ABI> pairs # if multilib builds are enabled. The best (most preferred) # ABI will come last. # @@ -152,7 +152,7 @@ multilib_get_enabled_abi_pairs() { # for the split is more complex than cheating like this for m_abi in ${m_abis//,/ }; do if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then - echo "${m_flag}:${abi}" + echo "${m_flag}.${abi}" found=1 break 2 fi @@ -167,7 +167,7 @@ multilib_get_enabled_abi_pairs() { debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}" debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}" - echo ":${abi}" + echo ".${abi}" fi } @@ -179,8 +179,8 @@ multilib_get_enabled_abi_pairs() { _multilib_multibuild_wrapper() { debug-print-function ${FUNCNAME} "${@}" - local ABI=${MULTIBUILD_VARIANT#*:} - local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%:*} + local ABI=${MULTIBUILD_VARIANT#*.} + local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%.*} multilib_toolchain_setup "${ABI}" "${@}" |