summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2019-10-03 18:05:56 +0300
committerAndrei Belov <defan@nginx.com>2019-10-03 18:05:56 +0300
commita05c5dff4ed364e261eb37e9eed7031e22f8f4d2 (patch)
treee635174bdc709400be6c77a370397a4d07b1e42d
parenta3392dd9cad612e10ab8b24b928996ab2ad061cd (diff)
downloadunit-a05c5dff4ed364e261eb37e9eed7031e22f8f4d2.tar.gz
unit-a05c5dff4ed364e261eb37e9eed7031e22f8f4d2.tar.bz2
Made rpm specs in line with the default branch.1.12.0-1
Corresponding bits have been reverted in 159b672b12ce.
-rw-r--r--pkg/rpm/unit.module.spec.in4
-rw-r--r--pkg/rpm/unit.spec.in5
2 files changed, 0 insertions, 9 deletions
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 023ebfab..2ef4ff1b 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -10,11 +10,7 @@
%define unit_version %%UNIT_VERSION%%
%define unit_release %%UNIT_RELEASE%%%{?dist}.ngx
-%if (0%{?rhel} == 6) && (%{_arch} == x86_64)
-%define CC_OPT %{optflags} -fno-strict-aliasing
-%else
%define CC_OPT %{optflags}
-%endif
%define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%")
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index afd2f1ff..7fc950ec 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -29,12 +29,7 @@ BuildRequires: openssl-devel
BuildRequires: libopenssl-devel
%endif
-%if (0%{?rhel} == 6) && (%{_arch} == x86_64)
-%define CC_OPT %{optflags} -fno-strict-aliasing -fPIC
-%else
%define CC_OPT %{optflags} -fPIC
-%endif
-
%define LD_OPT -Wl,-z,relro -Wl,-z,now -pie
%define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%")