diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-10-16 18:48:42 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-10-16 18:48:42 +0000 |
| commit | 24f8b24aecaad5f9bf3ded9645f595559f93d480 (patch) | |
| tree | 224a644f6c5e6e02f8938e9b95650bbafb9e6a25 /eclass/mysql.eclass | |
| parent | raise dependency on mail-client/claws-mail to 3.6.1 (diff) | |
| download | gentoo-2-24f8b24aecaad5f9bf3ded9645f595559f93d480.tar.gz gentoo-2-24f8b24aecaad5f9bf3ded9645f595559f93d480.tar.bz2 gentoo-2-24f8b24aecaad5f9bf3ded9645f595559f93d480.zip | |
Fix to work with libtool-2.2. Thanks to loki_val in bug #230271.
Diffstat (limited to 'eclass/mysql.eclass')
| -rw-r--r-- | eclass/mysql.eclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 56a77745d16b..8f0e74cd8ba6 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.96 2008/05/29 19:35:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.97 2008/10/16 18:48:42 betelgeuse Exp $ # Author: Francesco Riosa (Retired) <vivo@gentoo.org> # Maintainer: MySQL Team <mysql-bugs@gentoo.org> @@ -589,6 +589,13 @@ mysql_src_unpack() { [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ || die "Could not copy libtool.m4 to bdb/dist/" + #These files exist only with libtool-2*, and need to be included. + if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then + cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" + cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" + cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac" + cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" + fi pushd "bdb/dist" &>/dev/null sh s_all \ || die "Failed bdb reconfigure" |