1 |
betelgeuse 08/10/16 18:48:42 |
2 |
|
3 |
Modified: mysql.eclass |
4 |
Log: |
5 |
Fix to work with libtool-2.2. Thanks to loki_val in bug #230271. |
6 |
|
7 |
Revision Changes Path |
8 |
1.97 eclass/mysql.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.97&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.97&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.96&r2=1.97 |
13 |
|
14 |
Index: mysql.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
17 |
retrieving revision 1.96 |
18 |
retrieving revision 1.97 |
19 |
diff -u -r1.96 -r1.97 |
20 |
--- mysql.eclass 29 May 2008 19:35:51 -0000 1.96 |
21 |
+++ mysql.eclass 16 Oct 2008 18:48:42 -0000 1.97 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2007 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.96 2008/05/29 19:35:51 robbat2 Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.97 2008/10/16 18:48:42 betelgeuse Exp $ |
27 |
|
28 |
# Author: Francesco Riosa (Retired) <vivo@g.o> |
29 |
# Maintainer: MySQL Team <mysql-bugs@g.o> |
30 |
@@ -589,6 +589,13 @@ |
31 |
[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" |
32 |
cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ |
33 |
|| die "Could not copy libtool.m4 to bdb/dist/" |
34 |
+ #These files exist only with libtool-2*, and need to be included. |
35 |
+ if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then |
36 |
+ cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" |
37 |
+ cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" |
38 |
+ cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac" |
39 |
+ cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" |
40 |
+ fi |
41 |
pushd "bdb/dist" &>/dev/null |
42 |
sh s_all \ |
43 |
|| die "Failed bdb reconfigure" |