Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: xfconf.eclass
Date: Wed, 03 Nov 2010 17:40:06
Message-Id: 20101103173959.9BEA620051@flycatcher.gentoo.org
1 ssuominen 10/11/03 17:39:59
2
3 Modified: xfconf.eclass
4 Log:
5 Convert XFCONF to an array
6
7 Revision Changes Path
8 1.19 eclass/xfconf.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.19&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.19&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.18&r2=1.19
13
14 Index: xfconf.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v
17 retrieving revision 1.18
18 retrieving revision 1.19
19 diff -u -r1.18 -r1.19
20 --- xfconf.eclass 16 Sep 2010 17:09:51 -0000 1.18
21 +++ xfconf.eclass 3 Nov 2010 17:39:59 -0000 1.19
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2009 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.18 2010/09/16 17:09:51 ssuominen Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.19 2010/11/03 17:39:59 ssuominen Exp $
27
28 # @ECLASS: xfconf.eclass
29 # @MAINTAINER:
30 @@ -116,7 +116,13 @@
31 # Run econf with opts in XFCONF variable
32 xfconf_src_configure() {
33 debug-print-function ${FUNCNAME} "$@"
34 - econf ${XFCONF}
35 +
36 + # Convert XFCONF to an array, see base.eclass for original code
37 + if [[ "$(declare -p XFCONF 2>/dev/null 2>&1)" != "declare -a"* ]]; then
38 + XFCONF=( ${XFCONF} )
39 + fi
40 +
41 + econf ${XFCONF[@]}
42 }
43
44 # @FUNCTION: xfconf_src_compile