- fix building on x32 arch

diff --git a/mysql.spec b/mysql.spec
index 1f6b545e432d07b0cfeb6a4c92d1038684f3d531..6288864a9a9e7ad4eaed588636355b4fe955cff9 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -80,6 +80,7 @@ Patch23:      bug-44278.patch
 Patch24:       %{name}-cmake.patch
 Patch25:       %{name}-readline.patch
 Patch26:       mysqldumpslow-clusters.patch
+Patch27:       x32.patch
 URL:           http://www.mysql.com/products/community/
 BuildRequires: bison >= 1.875
 BuildRequires: cmake >= 2.6
@@ -525,6 +526,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..304e262
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- percona-server-5.6.21-70.1/include/m_string.h~     2014-12-28 15:51:15.000000000 +0000
++++ percona-server-5.6.21-70.1/include/m_string.h      2014-12-28 17:47:02.185659146 +0000
+@@ -252,7 +252,7 @@
+    @return          the last non-space character
+ */
+ 
+-#ifdef __x86_64__
++#if defined(__x86_64__) && !defined(__ILP32__)
+ 
+ #if SIZEOF_LONG != 8
+ # error "SIZEOF_LONG != 8"