- don't check abi (fails with gcc 4.5.0 due to broken check)

Changed files:
    mysql-abi_check.patch -> 1.1
    mysql.spec -> 1.480

diff --git a/mysql-abi_check.patch b/mysql-abi_check.patch
new file mode 100644 (file)
index 0000000..46125c7
--- /dev/null
+++ b/mysql-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/mysql.spec b/mysql.spec
index 9cc16e64dfeed8751c37e101be8c2ecb586fdb5c..ff2791ac9356a6480d9dc082c01abf6b03390448 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -71,6 +71,7 @@ Patch13:      %{name}-errorlog-no-rename.patch
 Patch14:       %{name}-bug-43594.patch
 Patch15:       plugin-avoid-version.patch
 Patch16:       %{name}-fix-dummy-thread-race-condition.patch
+Patch17:       %{name}-abi_check.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:      %{name}-userstats.patch
 Patch101:      %{name}-microslow.patch
@@ -516,6 +517,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 # <percona %patches>
 %patch100 -p1
 %patch101 -p1