Remove use of -mtune=native which breaks build on secondary architectures

This commit is contained in:
Marcin Juszkiewicz 2015-10-26 16:29:02 +01:00
parent 35e61c0256
commit 014d98795d
2 changed files with 20 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: galera Name: galera
Version: 25.3.12 Version: 25.3.12
Release: 1%{?dist} Release: 2%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
@ -10,6 +10,8 @@ Source0: http://releases.galeracluster.com/source/%{name}-3-%{version}.ta
Source1: garbd.service Source1: garbd.service
Source2: garbd-wrapper Source2: garbd-wrapper
Patch0: kill-mtune-native.patch
BuildRequires: boost-devel check-devel openssl-devel scons systemd BuildRequires: boost-devel check-devel openssl-devel scons systemd
Requires: nmap-ncat Requires: nmap-ncat
@ -28,6 +30,7 @@ replication engine see http://www.codership.com.
%prep %prep
%setup -q -n %{name}-3-%{version} %setup -q -n %{name}-3-%{version}
%patch0 -p1
%build %build
@ -81,6 +84,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog %changelog
* Wed Sep 30 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 25.3.12-2
- Remove use of -mtune=native which breaks build on secondary architectures
* Fri Sep 25 2015 Richard W.M. Jones <rjones@redhat.com> - 25.3.12-1 * Fri Sep 25 2015 Richard W.M. Jones <rjones@redhat.com> - 25.3.12-1
- Update to 25.3.12. - Update to 25.3.12.
- Should fix the build on 32 bit ARM (RHBZ#1241164). - Should fix the build on 32 bit ARM (RHBZ#1241164).

13
kill-mtune-native.patch Normal file
View File

@ -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 = ''