From 9a05597e243cca8e29a739f83e2c0957b661a584 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sat, 24 Apr 2010 07:52:54 +0000
Subject: [PATCH] - 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
---
 mysql-abi_check.patch | 28 ++++++++++++++++++++++++++++
 mysql.spec            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 mysql-abi_check.patch

diff --git a/mysql-abi_check.patch b/mysql-abi_check.patch
new file mode 100644
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 9cc16e6..ff2791a 100644
--- 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
-- 
2.44.0