[packages/mysql] - fix building on x32 arch
baggins
baggins at pld-linux.org
Sun Dec 28 18:57:02 CET 2014
commit db2e112e4041c663937c193568f15a2b33a34b97
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Dec 28 17:56:45 2014 +0000
- fix building on x32 arch
mysql.spec | 2 ++
x32.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/mysql.spec b/mysql.spec
index 1f6b545..6288864 100644
--- 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
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"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/db2e112e4041c663937c193568f15a2b33a34b97
More information about the pld-cvs-commit
mailing list