summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Riosa <vivo@gentoo.org>2006-12-10 02:33:30 +0000
committerFrancesco Riosa <vivo@gentoo.org>2006-12-10 02:33:30 +0000
commit327e0325855a9215521021c83544f69661914af6 (patch)
treeef1966a85a86b20dd60375f1fa07b78390a4dbe5 /eclass/mysql.eclass
parentSet minimal versions to exactly what's in upstream 2.16.1, for version parity... (diff)
downloadgentoo-2-327e0325855a9215521021c83544f69661914af6.tar.gz
gentoo-2-327e0325855a9215521021c83544f69661914af6.tar.bz2
gentoo-2-327e0325855a9215521021c83544f69661914af6.zip
oops, re-add static use flag when combined with minimal, thanks Scott Price
Diffstat (limited to 'eclass/mysql.eclass')
-rw-r--r--eclass/mysql.eclass9
1 files changed, 8 insertions, 1 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 6215ccb0deec..07692f813d66 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.46 2006/12/10 01:11:47 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.47 2006/12/10 02:33:30 vivo Exp $
# Author: Francesco Riosa <vivo@gentoo.org>
# Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -167,6 +167,13 @@ configure_minimal() {
done
myconf="${myconf} --with-extra-charsets=none"
myconf="${myconf} --enable-local-infile"
+
+ if useq "static" ; then
+ myconf="${myconf} --with-client-ldflags=-all-static"
+ myconf="${myconf} --disable-shared"
+ else
+ myconf="${myconf} --enable-shared --enable-static"
+ fi
}
configure_common() {