* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2010-10-07 19:14 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2010-10-07 19:14 UTC (permalink / raw
To: gentoo-commits
mgorny 10/10/07 19:14:48
Added: scons-utils.eclass
Log:
Introducing scons-utils.eclass -- a new eclass providing functions to help using SCons buildsystem.
Revision Changes Path
1.1 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.1&content-type=text/plain
Index: scons-utils.eclass
===================================================================
# 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.1 2010/10/07 19:14:48 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
# mgorny@gentoo.org
# @BLURB: helper functions to deal with SCons buildsystem
# @DESCRIPTION:
# This eclass provides a set of function to help developers sanely call
# dev-util/scons and pass parameters to it.
# @EXAMPLE:
#
# @CODE
# inherit scons-utils
#
# src_compile() {
# escons \
# $(use_scons nls ENABLE_NLS) \
# || die
# }
# @CODE
# -- public variables --
# @ECLASS-VARIABLE: SCONS_MIN_VERSION
# @DEFAULT_UNSET
# @DESCRIPTION:
# The minimal version of SCons required for the build to work.
# @ECLASS-VARIABLE: SCONSOPTS
# @DEFAULT_UNSET
# @DESCRIPTION:
# The default set of options to pass to scons. Similar to MAKEOPTS,
# supposed to be set in make.conf. If unset, escons() will use cleaned
# up MAKEOPTS instead.
# @ECLASS-VARIABLE: EXTRA_ESCONS
# @DEFAULT_UNSET
# @DESCRIPTION:
# The additional parameters to pass to SCons whenever escons() is used.
# @ECLASS-VARIABLE: USE_SCONS_TRUE
# @DESCRIPTION:
# The default value for truth in scons-use() (1 by default).
: ${USE_SCONS_TRUE:=1}
# @ECLASS-VARIABLE: USE_SCONS_FALSE
# @DESCRIPTION:
# The default value for false in scons-use() (0 by default).
: ${USE_SCONS_FALSE:=0}
# -- ebuild variables setup --
if [[ -n ${SCONS_MIN_VERSION} ]]; then
DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
else
DEPEND="dev-util/scons"
fi
# -- public functions --
# @FUNCTION: escons
# @USAGE: [scons-arg] ...
# @DESCRIPTION:
# Call scons, passing the supplied arguments, ${MAKEOPTS} and
# ${EXTRA_ESCONS}. Similar to emake.
escons() {
debug-print-function ${FUNCNAME} "${@}"
# if SCONSOPTS are _unset_, use cleaned MAKEOPTS
set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} "${@}"
echo "${@}" >&2
"${@}"
}
# @FUNCTION: scons_clean_makeopts
# @USAGE: [makeflags] [...]
# @DESCRIPTION:
# Strip the supplied makeflags (or ${MAKEOPTS} if called without
# an argument) of options not supported by SCons and make sure --jobs
# gets an argument. Output the resulting flag list (suitable
# for an assignment to SCONSOPTS).
scons_clean_makeopts() {
local new_makeopts
debug-print-function ${FUNCNAME} "${@}"
if [[ ${#} -eq 0 ]]; then
debug-print "Using MAKEOPTS: [${MAKEOPTS}]"
set -- ${MAKEOPTS}
else
# unquote if necessary
set -- ${*}
fi
# empty MAKEOPTS give out empty SCONSOPTS
# thus, we do need to worry about the initial setup
if [[ ${*} = ${_SCONS_CACHE_MAKEOPTS} ]]; then
set -- ${_SCONS_CACHE_SCONSOPTS}
debug-print "Cache hit: [${*}]"
echo ${*}
return
fi
export _SCONS_CACHE_MAKEOPTS=${*}
while [[ ${#} -gt 0 ]]; do
case ${1} in
# clean, simple to check -- we like that
--jobs=*|--keep-going)
new_makeopts=${new_makeopts+${new_makeopts} }${1}
;;
# need to take a look at the next arg and guess
--jobs)
if [[ ${#} -gt 1 && ${2} =~ [0-9]+ ]]; then
new_makeopts="${new_makeopts+${new_makeopts} }${1} ${2}"
shift
else
# no value means no limit, let's pass a random int
new_makeopts=${new_makeopts+${new_makeopts} }${1}=255
fi
;;
# strip other long options
--*)
;;
# short option hell
-*)
local str new_optstr
new_optstr=
str=${1#-}
while [[ -n ${str} ]]; do
case ${str} in
k*)
new_optstr=${new_optstr}k
;;
# -j needs to come last
j)
if [[ ${#} -gt 1 && ${2} =~ [0-9]+ ]]; then
new_optstr="${new_optstr}j ${2}"
shift
else
new_optstr="${new_optstr}j 255"
fi
;;
# otherwise, everything after -j is treated as an arg
j*)
new_optstr=${new_optstr}${str}
break
;;
esac
str=${str#?}
done
if [[ -n ${new_optstr} ]]; then
new_makeopts=${new_makeopts+${new_makeopts} }-${new_optstr}
fi
;;
esac
shift
done
set -- ${new_makeopts}
export _SCONS_CACHE_SCONSOPTS=${*}
debug-print "New SCONSOPTS: [${*}]"
echo ${*}
}
# @FUNCTION: use_scons
# @USAGE: <use-flag> [var-name] [var-opt-true] [var-opt-false]
# @DESCRIPTION:
# Output a SCons parameter with value depending on the USE flag state.
# If the USE flag is set, output <var-name>=<var-opt-true>; otherwise
# <var-name>=<var-opt-false>.
#
# If <var-name> is omitted, <use-flag> will be used instead. However,
# if <use-flag> starts with an exclamation mark (!flag), 'no' will be
# prepended to the name (e.g. noflag).
#
# If <var-opt-true> and/or <var-opt-false> are omitted,
# ${USE_SCONS_TRUE} and/or ${USE_SCONS_FALSE} will be used instead.
use_scons() {
local flag=${1}
local varname=${2:-${flag/\!/no}}
local vartrue=${3:-${USE_SCONS_TRUE}}
local varfalse=${4:-${USE_SCONS_FALSE}}
debug-print-function ${FUNCNAME} "${@}"
if [[ ${#} -eq 0 ]]; then
eerror "Usage: scons-use <use-flag> [var-name] [var-opt-true] [var-opt-false]"
die 'scons-use(): not enough arguments'
fi
if use "${flag}"; then
echo "${varname}=${vartrue}"
else
echo "${varname}=${varfalse}"
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2010-10-27 18:23 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2010-10-27 18:23 UTC (permalink / raw
To: gentoo-commits
mgorny 10/10/27 18:23:58
Modified: scons-utils.eclass
Log:
Add tc-export call to the example to denote that they need to be done manually.
Revision Changes Path
1.2 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.1&r2=1.2
Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scons-utils.eclass 7 Oct 2010 19:14:48 -0000 1.1
+++ scons-utils.eclass 27 Oct 2010 18:23:58 -0000 1.2
@@ -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.1 2010/10/07 19:14:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.2 2010/10/27 18:23:58 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
@@ -12,9 +12,10 @@
# @EXAMPLE:
#
# @CODE
-# inherit scons-utils
+# inherit scons-utils toolchain-funcs
#
# src_compile() {
+# tc-export CC CXX
# escons \
# $(use_scons nls ENABLE_NLS) \
# || die
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2011-02-07 14:55 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2011-02-07 14:55 UTC (permalink / raw
To: gentoo-commits
mgorny 11/02/07 14:55:08
Modified: scons-utils.eclass
Log:
Translate --jobs with no count to safer --jobs=5.
Value-less --jobs is mostly used along with --load-average, which is not supported by SCons. Thus, we should use a safe number of jobs.
Revision Changes Path
1.3 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.2&r2=1.3
Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scons-utils.eclass 27 Oct 2010 18:23:58 -0000 1.2
+++ scons-utils.eclass 7 Feb 2011 14:55:08 -0000 1.3
@@ -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.2 2010/10/27 18:23:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.3 2011/02/07 14:55:08 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
@@ -118,7 +118,7 @@
shift
else
# no value means no limit, let's pass a random int
- new_makeopts=${new_makeopts+${new_makeopts} }${1}=255
+ new_makeopts=${new_makeopts+${new_makeopts} }${1}=5
fi
;;
# strip other long options
@@ -141,7 +141,7 @@
new_optstr="${new_optstr}j ${2}"
shift
else
- new_optstr="${new_optstr}j 255"
+ new_optstr="${new_optstr}j 5"
fi
;;
# otherwise, everything after -j is treated as an arg
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2011-04-15 20:06 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2011-04-15 20:06 UTC (permalink / raw
To: gentoo-commits
mgorny 11/04/15 20:06:07
Modified: scons-utils.eclass
Log:
Check for EAPI. Make escons fatal in EAPI 4.
Revision Changes Path
1.4 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.3&r2=1.4
Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scons-utils.eclass 7 Feb 2011 14:55:08 -0000 1.3
+++ scons-utils.eclass 15 Apr 2011 20:06:07 -0000 1.4
@@ -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.3 2011/02/07 14:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.4 2011/04/15 20:06:07 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
@@ -51,6 +51,13 @@
# The default value for false in scons-use() (0 by default).
: ${USE_SCONS_FALSE:=0}
+# -- EAPI support check --
+
+case ${EAPI:-0} in
+ 0|1|2|3|4) ;;
+ *) die "EAPI ${EAPI} unsupported."
+esac
+
# -- ebuild variables setup --
if [[ -n ${SCONS_MIN_VERSION} ]]; then
@@ -65,14 +72,21 @@
# @USAGE: [scons-arg] ...
# @DESCRIPTION:
# Call scons, passing the supplied arguments, ${MAKEOPTS} and
-# ${EXTRA_ESCONS}. Similar to emake.
+# ${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} "${@}"
echo "${@}" >&2
"${@}"
+ ret=${?}
+
+ [[ ${ret} -ne 0 && ${EAPI:-0} -ge 4 ]] && die "escons failed."
+ return ${ret}
}
# @FUNCTION: scons_clean_makeopts
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2011-04-15 20:08 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2011-04-15 20:08 UTC (permalink / raw
To: gentoo-commits
mgorny 11/04/15 20:08:13
Modified: scons-utils.eclass
Log:
Denote that EXTRA_ESCONS is not supposed to be set in ebuilds.
Revision Changes Path
1.5 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.4&r2=1.5
Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scons-utils.eclass 15 Apr 2011 20:06:07 -0000 1.4
+++ scons-utils.eclass 15 Apr 2011 20:08:13 -0000 1.5
@@ -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.4 2011/04/15 20:06:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.5 2011/04/15 20:08:13 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
@@ -40,6 +40,8 @@
# @DEFAULT_UNSET
# @DESCRIPTION:
# The additional parameters to pass to SCons whenever escons() is used.
+# Much like EXTRA_EMAKE, this is not supposed to be used in make.conf
+# and not in ebuilds!
# @ECLASS-VARIABLE: USE_SCONS_TRUE
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2011-10-30 14:29 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2011-10-30 14:29 UTC (permalink / raw
To: gentoo-commits
mgorny 11/10/30 14:29:54
Modified: scons-utils.eclass
Log:
Fix broken number matching regexp in scons_clean_makeopts().
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=388961
Revision Changes Path
1.7 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.6&r2=1.7
Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scons-utils.eclass 29 Aug 2011 01:28:10 -0000 1.6
+++ scons-utils.eclass 30 Oct 2011 14:29:54 -0000 1.7
@@ -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.6 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.7 2011/10/30 14:29:54 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
@@ -129,7 +129,7 @@
;;
# need to take a look at the next arg and guess
--jobs)
- if [[ ${#} -gt 1 && ${2} =~ [0-9]+ ]]; then
+ if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
new_makeopts="${new_makeopts+${new_makeopts} }${1} ${2}"
shift
else
@@ -153,7 +153,7 @@
;;
# -j needs to come last
j)
- if [[ ${#} -gt 1 && ${2} =~ [0-9]+ ]]; then
+ if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
new_optstr="${new_optstr}j ${2}"
shift
else
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2011-10-30 14:30 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2011-10-30 14:30 UTC (permalink / raw
To: gentoo-commits
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=${?}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass
@ 2011-12-13 18:37 Michal Gorny (mgorny)
0 siblings, 0 replies; 8+ messages in thread
From: Michal Gorny (mgorny) @ 2011-12-13 18:37 UTC (permalink / raw
To: gentoo-commits
mgorny 11/12/13 18:37:25
Modified: scons-utils.eclass
Log:
Improve die-EAPI checking code.
Revision Changes Path
1.10 eclass/scons-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/scons-utils.eclass?r1=1.9&r2=1.10
Index: scons-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scons-utils.eclass 18 Nov 2011 20:51:10 -0000 1.9
+++ scons-utils.eclass 13 Dec 2011 18:37:25 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.9 2011/11/18 20:51:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.10 2011/12/13 18:37:25 mgorny Exp $
# @ECLASS: scons-utils.eclass
# @MAINTAINER:
@@ -105,7 +105,7 @@
"${@}"
ret=${?}
- [[ ${ret} -ne 0 && ${EAPI:-0} -ge 4 ]] && die "escons failed."
+ [[ ${ret} -ne 0 && ${EAPI} == 4 ]] && die "escons failed."
return ${ret}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-12-13 18:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-15 20:08 [gentoo-commits] gentoo-x86 commit in eclass: scons-utils.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2011-12-13 18:37 Michal Gorny (mgorny)
2011-10-30 14:30 Michal Gorny (mgorny)
2011-10-30 14:29 Michal Gorny (mgorny)
2011-04-15 20:06 Michal Gorny (mgorny)
2011-02-07 14:55 Michal Gorny (mgorny)
2010-10-27 18:23 Michal Gorny (mgorny)
2010-10-07 19:14 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox