[gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass

[Michal Gorny (mgorny)]

mgorny      11/10/30 14:30:24

  Modified:             scons-utils.eclass
  Log:
  Support setting common SCons arguments using myesconsargs.

Revision  Changes    Path
1.8                  eclass/scons-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.7&r2=1.8

Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scons-utils.eclass	30 Oct 2011 14:29:54 -0000	1.7
+++ scons-utils.eclass	30 Oct 2011 14:30:24 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.7 2011/10/30 14:29:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.8 2011/10/30 14:30:24 mgorny Exp $
 
 # @ECLASS: scons-utils.eclass
 # @MAINTAINER:
@@ -14,11 +14,21 @@
 # @CODE
 # inherit scons-utils toolchain-funcs
 #
+# EAPI=4
+#
+# src_configure() {
+# 	myesconsargs=(
+# 		CC="$(tc-getCC)"
+#		$(use_scons nls ENABLE_NLS)
+# 	)
+# }
+#
 # src_compile() {
-# 	tc-export CC CXX
-# 	escons \
-# 		$(use_scons nls ENABLE_NLS) \
-# 		|| die
+# 	escons
+# }
+#
+# src_install() {
+# 	escons install
 # }
 # @CODE
 
@@ -29,6 +39,12 @@
 # @DESCRIPTION:
 # The minimal version of SCons required for the build to work.
 
+# @VARIABLE: myesconsargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of package-specific options to pass to all SCons calls. Supposed to be
+# set in src_configure().
+
 # @ECLASS-VARIABLE: SCONSOPTS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -73,16 +89,17 @@
 # @FUNCTION: escons
 # @USAGE: [scons-arg] ...
 # @DESCRIPTION:
-# Call scons, passing the supplied arguments, ${MAKEOPTS} and
-# ${EXTRA_ESCONS}. Similar to emake. Like emake, this function does die
-# on failure in EAPI 4 (unless called nonfatal).
+# Call scons, passing the supplied arguments, ${myesconsargs[@]},
+# filtered ${MAKEOPTS}, ${EXTRA_ESCONS}. Similar to emake. Like emake,
+# this function does die on failure in EAPI 4 (unless called nonfatal).
 escons() {
 	local ret
 
 	debug-print-function ${FUNCNAME} "${@}"
 
 	# if SCONSOPTS are _unset_, use cleaned MAKEOPTS
-	set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} "${@}"
+	set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \
+		"${myesconsargs[@]}" "${@}"
 	echo "${@}" >&2
 	"${@}"
 	ret=${?}