jcallen 14/08/17 03:34:32 Modified: ChangeLog multilib-build.eclass Log: Add new multilib_native_enable and multilib_native_with functions; fix documentation
Revision Changes Path 1.1352 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1352&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1352&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1351&r2=1.1352 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1351 retrieving revision 1.1352 diff -u -r1.1351 -r1.1352 --- ChangeLog 12 Aug 2014 14:58:40 -0000 1.1351 +++ ChangeLog 17 Aug 2014 03:34:32 -0000 1.1352 @@ -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.1351 2014/08/12 14:58:40 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1352 2014/08/17 03:34:32 jcallen Exp $ + + 17 Aug 2014; Jonathan Callen <jcal...@gentoo.org> multilib-build.eclass: + Add new multilib_native_enable and multilib_native_with functions; fix + documentation 12 Aug 2014; Michael Palimaka <kensing...@gentoo.org> cmake-utils.eclass: Sync with KDE overlay, including a large number of cosmetic changes and 1.64 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.64&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.64&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.63&r2=1.64 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- multilib-build.eclass 4 Jul 2014 13:02:21 -0000 1.63 +++ multilib-build.eclass 17 Aug 2014 03:34:32 -0000 1.64 @@ -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.63 2014/07/04 13:02:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.64 2014/08/17 03:34:32 jcallen Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -567,9 +567,6 @@ # @DESCRIPTION: # Determine whether the currently built ABI is the profile native. # Return true status (0) if that is true, otherwise false (1). -# -# This function is not intended to be used directly. Please use -# multilib_build_binaries instead. multilib_is_native_abi() { debug-print-function ${FUNCNAME} "${@}" @@ -580,14 +577,7 @@ # @FUNCTION: multilib_build_binaries # @DESCRIPTION: -# Determine whether to build binaries for the currently built ABI. -# Returns true status (0) if the currently built ABI is the profile -# native or COMPLETE_MULTILIB variable is set to 'yes', otherwise -# false (1). -# -# This is often useful for configure calls when some of the options are -# supposed to be disabled for multilib ABIs (like those used for -# executables only). +# Deprecated synonym for multilib_is_native_abi multilib_build_binaries() { debug-print-function ${FUNCNAME} "${@}" @@ -615,7 +605,7 @@ # @FUNCTION: multilib_native_use_enable # @USAGE: <flag> [<opt-name> [<opt-value>]] # @DESCRIPTION: -# Output --enable configure option alike use_with if USE <flag> +# Output --enable configure option alike use_enable if USE <flag> # 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. @@ -627,6 +617,34 @@ fi } +# @FUNCTION: multilib_native_enable +# @USAGE: <opt-name> [<opt-value>] +# @DESCRIPTION: +# Output --enable configure option if executables are being built +# (multilib_is_native_abi is true). Otherwise, output --disable configure +# option. +multilib_native_enable() { + if multilib_is_native_abi; then + echo "--enable-${1}${2+=${2}}" + else + echo "--disable-${1}" + fi +} + +# @FUNCTION: multilib_native_with +# @USAGE: <opt-name> [<opt-value>] +# @DESCRIPTION: +# Output --with configure option if executables are being built +# (multilib_is_native_abi is true). Otherwise, output --without configure +# option. +multilib_native_with() { + if multilib_is_native_abi; then + echo "--with-${1}${2+=${2}}" + else + echo "--without-${1}" + fi +} + # @FUNCTION: multilib_native_usex # @USAGE: <flag> [<true1> [<false1> [<true2> [<false2>]]]] # @DESCRIPTION:
