summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.hgtags6
-rw-r--r--pkg/rpm/unit.module.spec.in4
-rw-r--r--pkg/rpm/unit.spec.in5
3 files changed, 15 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 6f87491e..b2d01a6d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -10,8 +10,14 @@ d2fcec5b0fa3b0e8da1945aa240d23be3bf94309 0.7
fbe7f5a3867e9559ef0884786fe5150aa60414e6 1.2
b3cf22b8a17e0e35ca80decb03ed2cceb662c3de 1.3
8f4524a9cf87fbddf626302da071f5055cf33f28 1.4
+99d69d59aa5edee3405d304886d9319291e392ba 1.4-2
b3dee0cc5a4edd046345511769b5cfec49044f1c 1.5
+e507438883ef0044c278f1accfc7bc7f90c0ffb6 1.5-1
d411e7fdee9e03036adb652f8d9f4c45a420bdd5 1.6
+01160bbced577121cb14d0b86ec1f8bb764cfab2 1.6-1
784b45adb0fe8bdd707510f59ed18309087e5c21 1.7
+abb8cfb421f608df1c23f5c333c5f049a79a681a 1.7-1
0f04ef991fbc1dadbc590ab7fb229d4f3d6357bc 1.7.1
+fe0d5eb09b66e77a2b66455faa51d3fa04146d3d 1.7.1-1
0a18a14d169f156f8e2daca35aa86d5a6dd9b1ae 1.8.0
+20c278ad17ce93cd4b3bd2532536c29759368f5b 1.8.0-1
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 6a229c0f..ab55d2a4 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -10,7 +10,11 @@
%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 05ee79af..2d5c1bd1 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -29,7 +29,12 @@ 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%%")