summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-03-20 14:27:17 +0100
committerRemi Collet <remi@remirepo.net>2018-03-20 14:27:17 +0100
commit197ce4ceb7ed86114d198340b4da9f6da5c3eeca (patch)
tree57f1da5763a3fa52bf3f5451bca0576965759078
parent5ae731dfd14db1190a1525915196d93ecc0b3365 (diff)
honours all build flags #1558128
-rw-r--r--argon2.spec10
1 files changed, 7 insertions, 3 deletions
diff --git a/argon2.spec b/argon2.spec
index 71d43c5..20a0413 100644
--- a/argon2.spec
+++ b/argon2.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for argon2
#
-# Copyright (c) 2017 Remi Collet
+# Copyright (c) 2017-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -18,7 +18,7 @@
Name: argon2
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 5%{?dist}
Group: Applications/System
Summary: The password-hashing tools
@@ -86,7 +86,8 @@ fi
sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc
# Honours default RPM build options and library path, do not use -march=native
-sed -e 's:-O3 -Wall:%{optflags}:' \
+sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
+ -e 's:-O3 -Wall:%{optflags}:' \
-e '/^LIBRARY_REL/s:lib:%{_lib}:' \
-e 's:-march=\$(OPTTARGET) :${CFLAGS} :' \
-e 's:CFLAGS += -march=\$(OPTTARGET)::' \
@@ -140,6 +141,9 @@ make test
%changelog
+* Thu Feb 15 2018 Remi Collet <remi@remirepo.net> - 20161029-5
+- honours all build flags #1558128
+
* Thu Nov 16 2017 Milan Broz <gmazyland@gmail.com> - 20161029-2
- Do not use -march=native in build, use system flags (rh #1512845).