commit 34c3c7910ec766de445e919f6cab49f3d0c213b6
Author: Elan Ruusamäe <[email protected]>
Date: Tue Jun 16 16:17:58 2009 +0000
- atomic memory instructions came with gcc >= 4.1
Changed files:
mysql-gcc3.patch -> 1.1.2.1
mysql.spec -> 1.353.2.70
mysql-gcc3.patch | 15 +++++++++++++++
mysql.spec | 6 +++++-
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/mysql.spec b/mysql.spec
index 7eb4c75..469fd8b 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -83,6 +83,7 @@ Patch29: %{name}-errorlog-no-rename.patch
Patch30: %{name}-alpha-stack.patch
Patch31: %{name}-xtrabackup.patch
Patch32: %{name}-fixes.patch
+Patch33: %{name}-gcc3.patch
URL:
http://www.mysql.com/products/database/mysql/community_edition.html
BuildRequires: autoconf
BuildRequires: automake
@@ -98,7 +99,7 @@ BuildRequires: ncurses-devel >= 4.2
BuildRequires: perl-devel >= 1:5.6.1
BuildRequires: readline-devel >= 4.2
BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.414
+BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: sed >= 4.0
BuildRequires: texinfo
BuildRequires: zlib-devel
@@ -528,6 +529,9 @@ mv sphinx-*/mysqlse sql/sphinx
%endif
%{?with_xtrabackup:%patch31 -p1}
%patch32 -p1
+%if "%{cxx_version}" < "4.1"
+%patch33 -p1
+%endif
%build
%{__libtoolize}
diff --git a/mysql-gcc3.patch b/mysql-gcc3.patch
new file mode 100644
index 0000000..08154f5
--- /dev/null
+++ b/mysql-gcc3.patch
@@ -0,0 +1,15 @@
+--- mysql-5.0.81/innobase/include/sync0rw.h~ 2009-05-26 00:35:13.000000000
+0300
++++ mysql-5.0.81/innobase/include/sync0rw.h 2009-06-16 19:09:27.587270045
+0300
+@@ -421,12 +421,6 @@
+ #ifdef HAVE_ATOMIC_BUILTINS
+ /* This value means NOT_LOCKED */
+ #define RW_LOCK_BIAS 0x00100000
+-#else
+-#error HAVE_ATOMIC_BUILTINS is not defined. Do you use enough new GCC or
compatibles?
+-#error Or do you use exact options for CFLAGS?
+-#error e.g. (for x86_32): "-m32 -march=i586 -mtune=i686"
+-#error e.g. (for Sparc_64): "-m64 -mcpu=v9"
+-#error Otherwise, this build may be slower than normal version.
+ #endif
+
+ /* NOTE! The structure appears here only for the compiler to know its size.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
