Merge lp:~paul-codesourcery/ubuntu/maverick/mysql-dfsg-5.1/gcc_abi_check_hack into lp:ubuntu/maverick/mysql-dfsg-5.1

[Paul Brook]

Fixes build failure on recent GCC (4.5 and linaro-gcc 4.4).
Modified version of upstream workaround (http://lists.mysql.com/commits/112967).

[Stefano Rivera (stefanor)]

As the bug appears to be closed, marking this WIP.

Unmerged revisions

32. By Paul Brook on 2010-07-12

Backport of workaround for upstream Bug #52514, tweaked to include GCC4.4
(for linaro builds)

=== added file 'debian/patches/03_abi_check_gcc_hack.dpatch'
--- debian/patches/03_abi_check_gcc_hack.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_abi_check_gcc_hack.dpatch	2010-07-12 09:17:59 +0000
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_abi_check_gcc_hack.dpatch by Paul Brook <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable broken abi_check on recent GCC (>= 4.4)
+## DP: Upstream Bug #51524
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql~/configure mysql/configure
+--- mysql~/configure	2010-07-12 08:31:09.000000000 +0000
++++ mysql/configure	2010-07-12 08:55:56.810534091 +0000
+@@ -18648,7 +18648,18 @@
+ then
+   ABI_CHECK=""
+ else
+-  ABI_CHECK="abi_check"
++  # Workaround GCC >= 4.5 - See Bug#52514
++  # Alsorequired for some variants of GCC 4.4
++  case `$CC -dumpversion` in
++    4.[4-9]* | 5.*)
++      { $as_echo "$as_me:$LINENO: WARNING: ABI check disabled (GCC >= 4.4)" >&5
++$as_echo "$as_me: WARNING: ABI check disabled (GCC >= 4.4)" >&2;}
++      ABI_CHECK=""
++      ;;
++    *)
++      ABI_CHECK="abi_check"
++      ;;
++  esac
+ fi
+ 
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql~/configure.in mysql/configure.in
+--- mysql~/configure.in	2010-07-12 08:31:09.000000000 +0000
++++ mysql/configure.in	2010-07-12 08:55:56.810534091 +0000
+@@ -464,7 +464,17 @@
+ then
+   ABI_CHECK=""
+ else
+-  ABI_CHECK="abi_check"
++  # Workaround GCC >= 4.5 - See Bug#52514
++  # Alsorequired for some variants of GCC 4.4
++  case `$CC -dumpversion` in
++    4.[[4-9]]* | 5.*)
++      AC_MSG_WARN([ABI check disabled (GCC >= 4.4)])
++      ABI_CHECK=""
++      ;;
++    *)
++      ABI_CHECK="abi_check"
++      ;;
++  esac
+ fi
+ 
+ AC_SUBST(ABI_CHECK)