mgorny 14/05/23 17:11:10 Modified: ChangeLog multilib-build.eclass Log: Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules and PATH separator.
Revision Changes Path 1.1271 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1271&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1271&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1270&r2=1.1271 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1270 retrieving revision 1.1271 diff -u -r1.1270 -r1.1271 --- ChangeLog 23 May 2014 07:53:22 -0000 1.1270 +++ ChangeLog 23 May 2014 17:11:10 -0000 1.1271 @@ -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 <[email protected]> multilib-build.eclass: + Change ABI-flag separator from ":" to "." to avoid issues with Makefile rules + and PATH separator. 23 May 2014; Michał Górny <[email protected]> multilib-build.eclass: Add remaining potential multilib arches to header wrapping template. 1.54 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.54&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.54&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.53&r2=1.54 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- multilib-build.eclass 23 May 2014 07:53:22 -0000 1.53 +++ multilib-build.eclass 23 May 2014 17:11:10 -0000 1.54 @@ -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 @@ # @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 @@ # 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 @@ 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_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}" "${@}"
