summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/mysql/.md5sum2
-rw-r--r--test/mysql/.footprint (renamed from extra/mysql/.footprint)0
-rw-r--r--test/mysql/.md5sum3
-rw-r--r--test/mysql/Pkgfile (renamed from extra/mysql/Pkgfile)8
-rw-r--r--test/mysql/README (renamed from extra/mysql/README)0
-rw-r--r--test/mysql/my.cnf (renamed from extra/mysql/my.cnf)0
-rw-r--r--test/mysql/mysql-5.1-gcc45-apicheck.patch28
-rw-r--r--test/mysql/mysql.nutyx.patch (renamed from extra/mysql/mysql.nutyx.patch)0
-rwxr-xr-xtest/mysql/post-install (renamed from extra/mysql/post-install)0
9 files changed, 35 insertions, 6 deletions
diff --git a/extra/mysql/.md5sum b/extra/mysql/.md5sum
deleted file mode 100644
index f71bb9c63..000000000
--- a/extra/mysql/.md5sum
+++ /dev/null
@@ -1,2 +0,0 @@
-b5d39e8789174753f3c782959729e68c mysql-5.1.41.tar.gz
-d98ff5376214c095d885cd4be4d3bef7 mysql.nutyx.patch
diff --git a/extra/mysql/.footprint b/test/mysql/.footprint
index 7c9879898..7c9879898 100644
--- a/extra/mysql/.footprint
+++ b/test/mysql/.footprint
diff --git a/test/mysql/.md5sum b/test/mysql/.md5sum
new file mode 100644
index 000000000..b1738a8dc
--- /dev/null
+++ b/test/mysql/.md5sum
@@ -0,0 +1,3 @@
+4cbf0fc3eb76057f7a8dd52a3e2a58e6 mysql-5.1-gcc45-apicheck.patch
+04f7c1422199c73a88a3d408b9161b63 mysql-5.1.46.tar.gz
+d98ff5376214c095d885cd4be4d3bef7 mysql.nutyx.patch
diff --git a/extra/mysql/Pkgfile b/test/mysql/Pkgfile
index 2e50c579f..90350d5db 100644
--- a/extra/mysql/Pkgfile
+++ b/test/mysql/Pkgfile
@@ -5,17 +5,18 @@
# Depends on: mysqlclient
name=mysql
-version=5.1.41
+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.nutyx.patch mysql-5.1-gcc45-apicheck.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
+# patch -Np0 -i mysql.nutyx.patch
cd $name-$version
+ patch -Np1 -i ../mysql-5.1-gcc45-apicheck.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/sbin \
@@ -25,7 +26,6 @@ build () {
--enable-local-infile \
--with-unix-socket-path=/var/run/mysql/mysql.sock \
--with-extra-charsets=all \
- --with-berkeley-db \
--without-debug \
--without-readline \
--without-docs \
diff --git a/extra/mysql/README b/test/mysql/README
index b0ba4cc38..b0ba4cc38 100644
--- a/extra/mysql/README
+++ b/test/mysql/README
diff --git a/extra/mysql/my.cnf b/test/mysql/my.cnf
index 37070a679..37070a679 100644
--- a/extra/mysql/my.cnf
+++ b/test/mysql/my.cnf
diff --git a/test/mysql/mysql-5.1-gcc45-apicheck.patch b/test/mysql/mysql-5.1-gcc45-apicheck.patch
new file mode 100644
index 000000000..46125c73e
--- /dev/null
+++ b/test/mysql/mysql-5.1-gcc45-apicheck.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/extra/mysql/mysql.nutyx.patch b/test/mysql/mysql.nutyx.patch
index cc1cdb43e..cc1cdb43e 100644
--- a/extra/mysql/mysql.nutyx.patch
+++ b/test/mysql/mysql.nutyx.patch
diff --git a/extra/mysql/post-install b/test/mysql/post-install
index 056fe5500..056fe5500 100755
--- a/extra/mysql/post-install
+++ b/test/mysql/post-install