From 2f275b1c22d92456ee811e2c3358388d09c497f8 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Thu, 16 Nov 2017 13:38:54 +0100
Subject: Do not use -march=native in build, use system flags (rh #1512845).

---
 argon2.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'argon2.spec')

diff --git a/argon2.spec b/argon2.spec
index e385f85..b94bfe5 100644
--- a/argon2.spec
+++ b/argon2.spec
@@ -18,7 +18,7 @@
 
 Name:    argon2
 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 Summary: The password-hashing tools
 
@@ -85,9 +85,11 @@ fi
 # Fix pkgconfig file
 sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc
 
-# Honours default RPM build options and library path
+# Honours default RPM build options and library path, do not use -march=native
 sed -e 's:-O3 -Wall:%{optflags}:' \
     -e '/^LIBRARY_REL/s:lib:%{_lib}:' \
+    -e 's:-march=\$(OPTTARGET) :${CFLAGS} :' \
+    -e 's:CFLAGS += -march=\$(OPTTARGET)::' \
     -i Makefile
 
 %build
@@ -136,5 +138,8 @@ make test
 
 
 %changelog
+* Thu Nov 16 2017 Milan Broz <gmazyland@gmail.com> - 20161029-2
+- Do not use -march=native in build, use system flags (rh #1512845).
+
 * Wed Oct 18 2017 Remi Collet <remi@remirepo.net> - 20161029-1
 - initial package
-- 
cgit