mgorny 14/04/28 17:38:22 Modified: ChangeLog multilib-build.eclass Log: Deprecate multilib_build_binaries, and switch the code to use multilib_is_native_abi.
Revision Changes Path 1.1227 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1227&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1227&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1226&r2=1.1227 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1226 retrieving revision 1.1227 diff -u -r1.1226 -r1.1227 --- ChangeLog 26 Apr 2014 05:13:24 -0000 1.1226 +++ ChangeLog 28 Apr 2014 17:38:21 -0000 1.1227 @@ -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.1226 2014/04/26 05:13:24 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1227 2014/04/28 17:38:21 mgorny Exp $ + + 28 Apr 2014; Michał Górny <[email protected]> multilib-build.eclass: + Deprecate multilib_build_binaries, and switch the code to use + multilib_is_native_abi. 26 Apr 2014; Joerg Bornkessel <[email protected]> -vdr-plugin.eclass: vdr-plugin.eclass removed, see #497058, #489116 1.40 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.40&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.40&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.39&r2=1.40 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- multilib-build.eclass 22 Apr 2014 20:12:53 -0000 1.39 +++ multilib-build.eclass 28 Apr 2014 17:38:21 -0000 1.40 @@ -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.39 2014/04/22 20:12:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.40 2014/04/28 17:38:21 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -394,7 +394,7 @@ mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die # symlink the native one back - if multilib_build_binaries; then + if multilib_is_native_abi; then ln -s "${CHOST}-${fn}" "${root}/${f}" || die fi done @@ -439,7 +439,9 @@ multilib_is_native_abi() { debug-print-function ${FUNCNAME} "${@}" - multilib_build_binaries "${@}" + [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments" + + [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] } # @FUNCTION: multilib_build_binaries @@ -455,20 +457,21 @@ multilib_build_binaries() { debug-print-function ${FUNCNAME} "${@}" - [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments" + eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" + eqawarn "multilib_is_native_abi function instead." - [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] + multilib_is_native_abi "${@}" } # @FUNCTION: multilib_native_use_with # @USAGE: <flag> [<opt-name> [<opt-value>]] # @DESCRIPTION: # Output --with configure option alike use_with if USE <flag> is enabled -# and executables are being built (multilib_build_binaries is true). +# and executables are being built (multilib_is_native_abi is true). # Otherwise, outputs --without configure option. Arguments are the same # as for use_with in the EAPI. multilib_native_use_with() { - if multilib_build_binaries; then + if multilib_is_native_abi; then use_with "${@}" else echo "--without-${2:-${1}}" @@ -479,11 +482,11 @@ # @USAGE: <flag> [<opt-name> [<opt-value>]] # @DESCRIPTION: # Output --enable configure option alike use_with if USE <flag> -# is enabled and executables are being built (multilib_build_binaries +# is enabled and executables are being built (multilib_is_native_abi # is true). Otherwise, outputs --disable configure option. Arguments are # the same as for use_enable in the EAPI. multilib_native_use_enable() { - if multilib_build_binaries; then + if multilib_is_native_abi; then use_enable "${@}" else echo "--disable-${2:-${1}}" @@ -495,13 +498,13 @@ # @DESCRIPTION: # Output the concatenation of <true1> (or 'yes' if unspecified) # and <true2> if USE <flag> is enabled and executables are being built -# (multilib_build_binaries is true). Otherwise, output the concatenation +# (multilib_is_native_abi is true). Otherwise, output the concatenation # of <false1> (or 'no' if unspecified) and <false2>. Arguments # are the same as for usex in the EAPI. # # Note: in EAPI 4 you need to inherit eutils to use this function. multilib_native_usex() { - if multilib_build_binaries; then + if multilib_is_native_abi; then usex "${@}" else echo "${3-no}${5}"
