packages: mysql/mysql.spec, mysql/mysql-abi_check.patch (NEW) - don't check...

[arekm]

Author: arekm                        Date: Sat Apr 24 07:53:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't check abi (fails with gcc 4.5.0 due to broken check)

---- Files affected:
packages/mysql:
   mysql.spec (1.479 -> 1.480) , mysql-abi_check.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.479 packages/mysql/mysql.spec:1.480
--- packages/mysql/mysql.spec:1.479	Sat Apr 24 09:35:57 2010
+++ packages/mysql/mysql.spec	Sat Apr 24 09:52:54 2010
@@ -72,6 +72,7 @@
 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
@@ -517,6 +518,7 @@
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 # <percona %patches>
 %patch100 -p1
 %patch101 -p1
@@ -1120,6 +1122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.480  2010/04/24 07:52:54  arekm
+- don't check abi (fails with gcc 4.5.0 due to broken check)
+
 Revision 1.479  2010/04/24 07:35:57  arekm
 - up to 5.1.46
 

================================================================
Index: packages/mysql/mysql-abi_check.patch
diff -u /dev/null packages/mysql/mysql-abi_check.patch:1.1
--- /dev/null	Sat Apr 24 09:53:00 2010
+++ packages/mysql/mysql-abi_check.patch	Sat Apr 24 09:52:54 2010
@@ -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.%
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.479&r2=1.480&f=u