diff --git a/galera.spec b/galera.spec index 468fa32..26a7fc8 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera Version: 25.3.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -10,6 +10,8 @@ Source0: http://releases.galeracluster.com/source/%{name}-3-%{version}.ta Source1: garbd.service Source2: garbd-wrapper +Patch0: kill-mtune-native.patch + BuildRequires: boost-devel check-devel openssl-devel scons systemd Requires: nmap-ncat @@ -28,6 +30,7 @@ replication engine see http://www.codership.com. %prep %setup -q -n %{name}-3-%{version} +%patch0 -p1 %build @@ -81,6 +84,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Wed Sep 30 2015 Marcin Juszkiewicz - 25.3.12-2 +- Remove use of -mtune=native which breaks build on secondary architectures + * Fri Sep 25 2015 Richard W.M. Jones - 25.3.12-1 - Update to 25.3.12. - Should fix the build on 32 bit ARM (RHBZ#1241164). diff --git a/kill-mtune-native.patch b/kill-mtune-native.patch new file mode 100644 index 0000000..5fbd9d7 --- /dev/null +++ b/kill-mtune-native.patch @@ -0,0 +1,13 @@ +Index: galera-3-25.3.12/SConstruct +=================================================================== +--- galera-3-25.3.12.orig/SConstruct ++++ galera-3-25.3.12/SConstruct +@@ -107,7 +107,7 @@ elif machine == 's390x': + if bits == 32: + compile_arch += ' -m32' + else: +- compile_arch = ' -mtune=native' ++ compile_arch = '' + link_arch = '' + +