[mysql-connector-odbc] Adjust CFLAGS for compatibility with mysql 5.5.10.

Tom Lane tgl at fedoraproject.org
Wed Mar 23 15:16:40 UTC 2011


commit e8f2d3fb354761ed338f343d095f6dafccd8d415
Author: Tom Lane <tgl at redhat.com>
Date:   Wed Mar 23 11:15:48 2011 -0400

    Adjust CFLAGS for compatibility with mysql 5.5.10.

 mysql-connector-odbc.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index a8e354b..526fdf9 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -45,7 +45,11 @@ tar xfz %{SOURCE1}
 %patch4 -p1
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing"
+# mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
+# started #define'ing MY_PTHREAD_FASTMUTEX, and neither of those changes
+# sit well with mysql-connector-odbc 5.1.8.  Revisit need for these hacks
+# when updating to newer release.
+export CFLAGS="%{optflags} -fno-strict-aliasing -DTHREAD=1 -UMY_PTHREAD_FASTMUTEX"
 
 libtoolize --copy --force
 aclocal
@@ -95,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*so
 
 %changelog
-* Tue Mar 22 2011 Tom Lane <tgl at redhat.com> 5.1.8-3
+* Wed Mar 23 2011 Tom Lane <tgl at redhat.com> 5.1.8-3
 - Rebuild for libmysqlclient 5.5.10 soname version bump
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.8-2


More information about the scm-commits mailing list