summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2007-03-06 15:55:55 +0000
committerLuca Longinotti <chtekk@gentoo.org>2007-03-06 15:55:55 +0000
commit35d91ef58032e22f7e360a8f1c25ca52d50337f8 (patch)
tree78fa3529dc503cc3b2cd9decf5d68ca997cf2fdd /eclass
parentorbit-2.14.3 is gone (diff)
downloadgentoo-2-35d91ef58032e22f7e360a8f1c25ca52d50337f8.tar.gz
gentoo-2-35d91ef58032e22f7e360a8f1c25ca52d50337f8.tar.bz2
gentoo-2-35d91ef58032e22f7e360a8f1c25ca52d50337f8.zip
Fix libtool bug in the right place.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mysql.eclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 0ae73bdcd86e..4698b464a88a 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.70 2007/01/12 23:33:19 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.71 2007/03/06 15:55:55 chtekk Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -543,10 +543,11 @@ mysql_src_unpack() {
if mysql_check_version_range "4.1 to 5.0.99.99" \
&& use berkdb ; then
[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
- pushd "bdb/dist" \
- && sh s_all \
- || die "Failed bdb reconfigure" \
- &>/dev/null
+ cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
+ || die "Could not copy libtool.m4 to bdb/dist/"
+ pushd "bdb/dist" &>/dev/null
+ sh s_all \
+ || die "Failed bdb reconfigure"
popd &>/dev/null
fi
}