summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2012-12-16 14:11:58 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2012-12-16 14:11:58 +0000
commit78c66f558dd2f2e2c3133f48c16f2555af8b8d03 (patch)
treeb289372511d375387f6c19413a50a155c210c7c2 /eclass
parentCleanup due retirement, #95685 (diff)
downloadgentoo-2-78c66f558dd2f2e2c3133f48c16f2555af8b8d03.tar.gz
gentoo-2-78c66f558dd2f2e2c3133f48c16f2555af8b8d03.tar.bz2
gentoo-2-78c66f558dd2f2e2c3133f48c16f2555af8b8d03.zip
Pass --disable-schemas-compile from gsettings.m4 in gnome2_src_configure.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/gnome2.eclass7
2 files changed, 10 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index f5d7d88f1553..95f0a1419d05 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.561 2012/12/15 21:30:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.562 2012/12/16 14:11:58 eva Exp $
+
+ 16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> gnome2.eclass:
+ Pass --disable-schemas-compile from gsettings.m4 in gnome2_src_configure.
15 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Fix the relative linking algo to handle /// in path.
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c2c3fd576ba7..e5db146a7774 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.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/gnome2.eclass,v 1.116 2012/12/05 23:41:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.117 2012/12/16 14:11:58 eva Exp $
# @ECLASS: gnome2.eclass
# @MAINTAINER:
@@ -160,6 +160,11 @@ gnome2_src_configure() {
G2CONF="${G2CONF} --disable-schemas-install"
fi
+ # Pass --disable-schemas-compile when possible
+ if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then
+ G2CONF="${G2CONF} --disable-schemas-compile"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"