From 54864c08cf3b896d129b89e9c34a9149e867e610 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Mar 05 2005 21:58:09 +0000
Subject: Get mysql to actually build and work with devel tip gcc.


---

diff --git a/mysql.spec b/mysql.spec
index a491a9f..341d736 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -12,7 +12,7 @@ Patch1: mysql-libdir.patch
 Patch2: mysql-errno.patch
 Patch3: mysql-libtool.patch
 Patch4: mysql-testing.patch
-Patch5: mysql-4.1.10-gcc.patch
+Patch5: mysql-4.1.10-macro-safety.patch
 URL: http://www.mysql.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: MySQL client programs and shared libraries.
@@ -98,6 +98,8 @@ autoheader
 
 %build
 CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+# MySQL 4.1.10 definitely doesn't work under strict aliasing
+CFLAGS="$CFLAGS -fno-strict-aliasing"
 %ifarch alpha
 # Can't link C++ objects into an executable without this. Odd!
 # -ECL 2002-12-19
@@ -362,8 +364,8 @@ fi
 
 %changelog
 * Sat Mar  5 2005 Tom Lane <tgl@redhat.com> 4.1.10-2
-- Work around what seems to be a gcc 4.0 bug, but might just be excessively
-  tense coding in mysql.
+- Need -fno-strict-aliasing in at least one place, probably more.
+- Work around some C spec violations in mysql.
 
 * Fri Feb 18 2005 Tom Lane <tgl@redhat.com> 4.1.10-1
 - Update to MySQL 4.1.10.