- fix building on x32

- rel 2

diff --git a/mysql.spec b/mysql.spec
index 93151967b829430adee5ace5a13dc7e69ca23b5e..7636a10deccbc0b112d16e6408a82408e4bf9612 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -35,7 +35,7 @@ Summary(uk.UTF-8):    MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
 Version:       5.5.57
-Release:       1
+Release:       2
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -59,7 +59,7 @@ Source13:     %{name}-client.conf
 Source14:      my.cnf
 # from fedora
 Source15:      lib%{name}.version
-
+Patch0:                x32.patch
 Patch2:                %{name}hotcopy-5.0-5.5.patch
 Patch3:                bug-67402.patch
 # from fedora
@@ -499,6 +499,8 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch18 -p1
 %endif
 
+%patch0 -p1
+
 %patch2 -p1
 %patch3 -p1
 

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..237c268
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- percona-server-5.5.57-38.9/include/m_string.h~     2017-09-03 14:08:34.000000000 +0200
++++ percona-server-5.5.57-38.9/include/m_string.h      2017-09-03 14:10:58.545427673 +0200
+@@ -273,7 +273,7 @@
+    @return          the last non-space character
+ */
+ 
+-#ifdef __x86_64__
++#if defined(__x86_64__) && !defined(__ILP32__)
+ 
+ #if SIZEOF_LONG != 8
+ # error "SIZEOF_LONG != 8"