mysql dans extra

10 files changed, 36 insertions, 6 deletions

diff --git a/test/mysql/.footprint b/extra/mysql/.footprint
index 7c9879898..7c9879898 100644
--- a/test/mysql/.footprint
+++ b/extra/mysql/.footprint
diff --git a/extra/mysql/.md5sum b/extra/mysql/.md5sum
new file mode 100644
index 000000000..5cae01826
--- /dev/null
+++ b/extra/mysql/.md5sum
@@ -0,0 +1,2 @@
+4cbf0fc3eb76057f7a8dd52a3e2a58e6  mysql-5.1.46-skip-abi-check.patch
+04f7c1422199c73a88a3d408b9161b63  mysql-5.1.46.tar.gz
diff --git a/test/mysql/Pkgfile b/extra/mysql/Pkgfile
index 90350d5db..4ea3c2ddb 100644
--- a/test/mysql/Pkgfile
+++ b/extra/mysql/Pkgfile
@@ -8,15 +8,18 @@ name=mysql
 version=5.1.46
 release=1
 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \
-        mysql.nutyx.patch mysql-5.1-gcc45-apicheck.patch )
+        mysql-$version-skip-abi-check.patch )
 
 build () {
 	source /etc/blfs-bootscripts
         wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
-#	patch -Np0 -i mysql.nutyx.patch
 	cd $name-$version
-	patch -Np1 -i ../mysql-5.1-gcc45-apicheck.patch 
+	patch -Np1 -i ../mysql-$version-skip-abi-check.patch
+	libtoolize --force
+	aclocal
+	autoconf
+	automake
 	./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --libexecdir=/usr/sbin \
diff --git a/test/mysql/README b/extra/mysql/README
index b0ba4cc38..b0ba4cc38 100644
--- a/test/mysql/README
+++ b/extra/mysql/README
diff --git a/test/mysql/my.cnf b/extra/mysql/my.cnf
index 37070a679..37070a679 100644
--- a/test/mysql/my.cnf
+++ b/extra/mysql/my.cnf
diff --git a/test/mysql/mysql-5.1-gcc45-apicheck.patch b/extra/mysql/mysql-5.1-gcc45-apicheck.patch
index 46125c73e..46125c73e 100644
--- a/test/mysql/mysql-5.1-gcc45-apicheck.patch
+++ b/extra/mysql/mysql-5.1-gcc45-apicheck.patch
diff --git a/extra/mysql/mysql-5.1.46-skip-abi-check.patch b/extra/mysql/mysql-5.1.46-skip-abi-check.patch
new file mode 100644
index 000000000..46125c73e
--- /dev/null
+++ b/extra/mysql/mysql-5.1.46-skip-abi-check.patch
@@ -0,0 +1,28 @@
+--- mysql-5.1.45/Makefile.am.orig	2010-03-31 10:52:25.000000000 -0400
++++ mysql-5.1.45/Makefile.am	2010-03-31 10:55:05.000000000 -0400
+@@ -312,24 +312,7 @@
+ 	$(MAKE) abi_headers="$^" do_abi_check
+ 
+ do_abi_check:
+-	set -ex; \
+-	for file in $(abi_headers); do \
+-	         @CC@ -E -nostdinc -dI \
+-	                  -I$(top_srcdir)/include \
+-	                  -I$(top_srcdir)/include/mysql \
+-	                  -I$(top_srcdir)/sql \
+-	                  -I$(top_builddir)/include \
+-	                  -I$(top_builddir)/include/mysql \
+-	                  -I$(top_builddir)/sql \
+-	                                 $$file 2>/dev/null | \
+-	                  @SED@ -e '/^# /d' \
+-	                            -e '/^[ 	]*$$/d' \
+-	                            -e '/^#pragma GCC set_debug_pwd/d' \
+-	                            -e '/^#ident/d' > \
+-	                                       $(top_builddir)/abi_check.out; \
+-	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
+-	                  @RM@ $(top_builddir)/abi_check.out; \
+-	done
++	echo "Skipping do_abi_check"
+ 
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
diff --git a/test/mysql/mysql.nutyx.patch b/extra/mysql/mysql.nutyx.patch
index cc1cdb43e..cc1cdb43e 100644
--- a/test/mysql/mysql.nutyx.patch
+++ b/extra/mysql/mysql.nutyx.patch
diff --git a/test/mysql/post-install b/extra/mysql/post-install
index 056fe5500..056fe5500 100755
--- a/test/mysql/post-install
+++ b/extra/mysql/post-install
diff --git a/test/mysql/.md5sum b/test/mysql/.md5sum
deleted file mode 100644
index b1738a8dc..000000000
--- a/test/mysql/.md5sum
+++ /dev/null
@@ -1,3 +0,0 @@
-4cbf0fc3eb76057f7a8dd52a3e2a58e6  mysql-5.1-gcc45-apicheck.patch
-04f7c1422199c73a88a3d408b9161b63  mysql-5.1.46.tar.gz
-d98ff5376214c095d885cd4be4d3bef7  mysql.nutyx.patch