summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-06-11 12:57:14 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-06-11 12:57:14 +0000
commitc0b8e714295c3e6c98989e3070ac88aea16e3dd9 (patch)
tree71fff971de1a42097fc52167bfc8838c539baa42
parentStable for x86, wrt bug #417909 (diff)
downloadgentoo-2-c0b8e714295c3e6c98989e3070ac88aea16e3dd9.tar.gz
gentoo-2-c0b8e714295c3e6c98989e3070ac88aea16e3dd9.tar.bz2
gentoo-2-c0b8e714295c3e6c98989e3070ac88aea16e3dd9.zip
Fix not assigned variable. IE bug#416673.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/xorg-2.eclass4
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 04db99a84e1c..1b742047acbe 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.306 2012/06/10 14:59:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.307 2012/06/11 12:57:14 scarabeus Exp $
+
+ 11 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> xorg-2.eclass:
+ Fix not assigned variable. IE bug#416673.
10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
fix for strip-linguas en
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index d63b23e46e85..48c3d01c441d 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.55 2012/05/09 20:19:10 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.56 2012/06/11 12:57:14 scarabeus Exp $
# @ECLASS: xorg-2.eclass
# @MAINTAINER:
@@ -418,7 +418,7 @@ xorg-2_src_configure() {
eqawarn "to preserve namespace."
fi
- local xorgconfadd=(${CONFIGURE_OPTIONS})
+ local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS})
else
local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
fi