diff options
38 files changed, 53 insertions, 35 deletions
@@ -10,11 +10,20 @@ 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 +f47fc64d3d9e3dedb95042e93c7f73b31f458338 1.8.0-1 dda6319de785dc2d225d818349aba56fc48d47f6 1.9.0 +c927a739754ade5ecf7be8da30f6c42446e72d8c 1.9.0-1 cdbba3c3e3762eacc308a5407877c3665a05058d 1.10.0 +01322f5ec4e37fd0fd8d9d3e491e8539341160f3 1.10.0-1 +b651ff72ffe080835f884a1ace8fa24eb33e3569 1.10.0-2 3b1601ac0f2f53fed4cae01b9db0e4e070665cae 1.11.0 diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 952408cd..ac7cc679 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -2,7 +2,7 @@ include ../../version -DEFAULT_RELEASE := 1 +DEFAULT_RELEASE := 2 VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go index 3399f5ca..549a2b3b 100644 --- a/pkg/deb/Makefile.go +++ b/pkg/deb/Makefile.go @@ -4,7 +4,7 @@ MODULE_SUFFIX_go= go MODULE_SUMMARY_go= Go module for NGINX Unit MODULE_VERSION_go= $(VERSION) -MODULE_RELEASE_go= 1 +MODULE_RELEASE_go= 2 MODULE_CONFARGS_go= go --go-path=/usr/share/gocode MODULE_MAKEARGS_go= go diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110 index 0e956d9f..b678e278 100644 --- a/pkg/deb/Makefile.go110 +++ b/pkg/deb/Makefile.go110 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go110= go1.10 MODULE_SUMMARY_go110= Go 1.10 module for NGINX Unit MODULE_VERSION_go110= $(VERSION) -MODULE_RELEASE_go110= 1 +MODULE_RELEASE_go110= 2 MODULE_CONFARGS_go110= go --go=/usr/lib/go-1.10/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go110= /usr/lib/go-1.10/bin/go diff --git a/pkg/deb/Makefile.go111 b/pkg/deb/Makefile.go111 index f8ed5ae8..4af99ac1 100644 --- a/pkg/deb/Makefile.go111 +++ b/pkg/deb/Makefile.go111 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go111= go1.11 MODULE_SUMMARY_go111= Go 1.11 module for NGINX Unit MODULE_VERSION_go111= $(VERSION) -MODULE_RELEASE_go111= 1 +MODULE_RELEASE_go111= 2 MODULE_CONFARGS_go111= go --go=/usr/lib/go-1.11/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go111= /usr/lib/go-1.11/bin/go diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17 index d014edd1..a2032ce9 100644 --- a/pkg/deb/Makefile.go17 +++ b/pkg/deb/Makefile.go17 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go17= go1.7 MODULE_SUMMARY_go17= Go 1.7 module for NGINX Unit MODULE_VERSION_go17= $(VERSION) -MODULE_RELEASE_go17= 1 +MODULE_RELEASE_go17= 2 MODULE_CONFARGS_go17= go --go=/usr/lib/go-1.7/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go17= /usr/lib/go-1.7/bin/go diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18 index 597f4804..601f18c9 100644 --- a/pkg/deb/Makefile.go18 +++ b/pkg/deb/Makefile.go18 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go18= go1.8 MODULE_SUMMARY_go18= Go 1.8 module for NGINX Unit MODULE_VERSION_go18= $(VERSION) -MODULE_RELEASE_go18= 1 +MODULE_RELEASE_go18= 2 MODULE_CONFARGS_go18= go --go=/usr/lib/go-1.8/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go18= /usr/lib/go-1.8/bin/go diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19 index 60d4b239..7ca8ea1a 100644 --- a/pkg/deb/Makefile.go19 +++ b/pkg/deb/Makefile.go19 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go19= go1.9 MODULE_SUMMARY_go19= Go 1.9 module for NGINX Unit MODULE_VERSION_go19= $(VERSION) -MODULE_RELEASE_go19= 1 +MODULE_RELEASE_go19= 2 MODULE_CONFARGS_go19= go --go=/usr/lib/go-1.9/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go19= /usr/lib/go-1.9/bin/go diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index 30f777fd..3f34aece 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc_common= jsc-common MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) -MODULE_RELEASE_jsc_common= 1 +MODULE_RELEASE_jsc_common= 2 ifneq (,$(findstring $(CODENAME),disco buster)) JAVA_MINVERSION= 11 diff --git a/pkg/deb/Makefile.jsc10 b/pkg/deb/Makefile.jsc10 index 43ded86b..df59abb8 100644 --- a/pkg/deb/Makefile.jsc10 +++ b/pkg/deb/Makefile.jsc10 @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc10= jsc10 MODULE_SUMMARY_jsc10= Java 10 module for NGINX Unit MODULE_VERSION_jsc10= $(VERSION) -MODULE_RELEASE_jsc10= 1 +MODULE_RELEASE_jsc10= 2 MODULE_CONFARGS_jsc10= java --module=java10 --home=/usr/lib/jvm/java-11-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ MODULE_MAKEARGS_jsc10= java10 diff --git a/pkg/deb/Makefile.jsc11 b/pkg/deb/Makefile.jsc11 index 40f60f17..fcf17bc9 100644 --- a/pkg/deb/Makefile.jsc11 +++ b/pkg/deb/Makefile.jsc11 @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc11= jsc11 MODULE_SUMMARY_jsc11= Java 11 module for NGINX Unit MODULE_VERSION_jsc11= $(VERSION) -MODULE_RELEASE_jsc11= 1 +MODULE_RELEASE_jsc11= 2 MODULE_CONFARGS_jsc11= java --module=java11 --home=/usr/lib/jvm/java-11-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ MODULE_MAKEARGS_jsc11= java11 diff --git a/pkg/deb/Makefile.jsc8 b/pkg/deb/Makefile.jsc8 index d7eed96b..a98a4a3a 100644 --- a/pkg/deb/Makefile.jsc8 +++ b/pkg/deb/Makefile.jsc8 @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc8= jsc8 MODULE_SUMMARY_jsc8= Java 8 module for NGINX Unit MODULE_VERSION_jsc8= $(VERSION) -MODULE_RELEASE_jsc8= 1 +MODULE_RELEASE_jsc8= 2 MODULE_CONFARGS_jsc8= java --module=java8 --home=/usr/lib/jvm/java-8-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ MODULE_MAKEARGS_jsc8= java8 diff --git a/pkg/deb/Makefile.perl b/pkg/deb/Makefile.perl index 7ac3ea11..8f47a7d3 100644 --- a/pkg/deb/Makefile.perl +++ b/pkg/deb/Makefile.perl @@ -4,7 +4,7 @@ MODULE_SUFFIX_perl= perl MODULE_SUMMARY_perl= Perl module for NGINX Unit MODULE_VERSION_perl= $(VERSION) -MODULE_RELEASE_perl= 1 +MODULE_RELEASE_perl= 2 MODULE_CONFARGS_perl= perl MODULE_MAKEARGS_perl= perl diff --git a/pkg/deb/Makefile.php b/pkg/deb/Makefile.php index d05d5ad5..d46a09c9 100644 --- a/pkg/deb/Makefile.php +++ b/pkg/deb/Makefile.php @@ -4,7 +4,7 @@ MODULE_SUFFIX_php= php MODULE_SUMMARY_php= PHP module for NGINX Unit MODULE_VERSION_php= $(VERSION) -MODULE_RELEASE_php= 1 +MODULE_RELEASE_php= 2 MODULE_CONFARGS_php= php MODULE_MAKEARGS_php= php diff --git a/pkg/deb/Makefile.python b/pkg/deb/Makefile.python index 9bf02bac..84d2bb64 100644 --- a/pkg/deb/Makefile.python +++ b/pkg/deb/Makefile.python @@ -4,7 +4,7 @@ MODULE_SUFFIX_python= python MODULE_SUMMARY_python= Python module for NGINX Unit MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 1 +MODULE_RELEASE_python= 2 MODULE_CONFARGS_python= python MODULE_MAKEARGS_python= python diff --git a/pkg/deb/Makefile.python27 b/pkg/deb/Makefile.python27 index cf4f49d9..7779b7b3 100644 --- a/pkg/deb/Makefile.python27 +++ b/pkg/deb/Makefile.python27 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python27= python2.7 MODULE_SUMMARY_python27= Python 2.7 module for NGINX Unit MODULE_VERSION_python27= $(VERSION) -MODULE_RELEASE_python27= 1 +MODULE_RELEASE_python27= 2 MODULE_CONFARGS_python27= python --config=python2.7-config MODULE_MAKEARGS_python27= python2.7 diff --git a/pkg/deb/Makefile.python34 b/pkg/deb/Makefile.python34 index 03c496bd..71ab873d 100644 --- a/pkg/deb/Makefile.python34 +++ b/pkg/deb/Makefile.python34 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python34= python3.4 MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit MODULE_VERSION_python34= $(VERSION) -MODULE_RELEASE_python34= 1 +MODULE_RELEASE_python34= 2 MODULE_CONFARGS_python34= python --config=python3.4-config MODULE_MAKEARGS_python34= python3.4 diff --git a/pkg/deb/Makefile.python35 b/pkg/deb/Makefile.python35 index 514a4bf6..9f0b705c 100644 --- a/pkg/deb/Makefile.python35 +++ b/pkg/deb/Makefile.python35 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python35= python3.5 MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit MODULE_VERSION_python35= $(VERSION) -MODULE_RELEASE_python35= 1 +MODULE_RELEASE_python35= 2 MODULE_CONFARGS_python35= python --config=python3.5-config MODULE_MAKEARGS_python35= python3.5 diff --git a/pkg/deb/Makefile.python36 b/pkg/deb/Makefile.python36 index 4fd898c6..93f12bd8 100644 --- a/pkg/deb/Makefile.python36 +++ b/pkg/deb/Makefile.python36 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python36= python3.6 MODULE_SUMMARY_python36= Python 3.6 module for NGINX Unit MODULE_VERSION_python36= $(VERSION) -MODULE_RELEASE_python36= 1 +MODULE_RELEASE_python36= 2 MODULE_CONFARGS_python36= python --config=python3.6-config MODULE_MAKEARGS_python36= python3.6 diff --git a/pkg/deb/Makefile.python37 b/pkg/deb/Makefile.python37 index 54dd8c4c..652986f3 100644 --- a/pkg/deb/Makefile.python37 +++ b/pkg/deb/Makefile.python37 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python37= python3.7 MODULE_SUMMARY_python37= Python 3.7 module for NGINX Unit MODULE_VERSION_python37= $(VERSION) -MODULE_RELEASE_python37= 1 +MODULE_RELEASE_python37= 2 MODULE_CONFARGS_python37= python --config=python3.7-config MODULE_MAKEARGS_python37= python3.7 diff --git a/pkg/deb/Makefile.ruby b/pkg/deb/Makefile.ruby index dd85cd38..039f1ce4 100644 --- a/pkg/deb/Makefile.ruby +++ b/pkg/deb/Makefile.ruby @@ -4,7 +4,7 @@ MODULE_SUFFIX_ruby= ruby MODULE_SUMMARY_ruby= Ruby module for NGINX Unit MODULE_VERSION_ruby= $(VERSION) -MODULE_RELEASE_ruby= 1 +MODULE_RELEASE_ruby= 2 MODULE_CONFARGS_ruby= ruby MODULE_MAKEARGS_ruby= ruby diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index e826cb95..b4ed95f4 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -2,7 +2,7 @@ include ../../version -DEFAULT_RELEASE := 1 +DEFAULT_RELEASE := 2 VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 4e970e45..af6c61b1 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -2,7 +2,7 @@ include ../../version -DEFAULT_RELEASE := 1 +DEFAULT_RELEASE := 2 VERSION ?= $(NXT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go index 09dffd21..bdfb20ce 100644 --- a/pkg/rpm/Makefile.go +++ b/pkg/rpm/Makefile.go @@ -4,7 +4,7 @@ MODULE_SUFFIX_go= go MODULE_SUMMARY_go= Go module for NGINX Unit MODULE_VERSION_go= $(VERSION) -MODULE_RELEASE_go= 1 +MODULE_RELEASE_go= 2 MODULE_CONFARGS_go= go --go-path=%{gopath} MODULE_MAKEARGS_go= go diff --git a/pkg/rpm/Makefile.jsc-common b/pkg/rpm/Makefile.jsc-common index d8c308de..68d7721d 100644 --- a/pkg/rpm/Makefile.jsc-common +++ b/pkg/rpm/Makefile.jsc-common @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc_common= jsc-common MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) -MODULE_RELEASE_jsc_common= 1 +MODULE_RELEASE_jsc_common= 2 JAVA_ARCH_jsc_common= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>&1 | grep -F -e os.arch | sed -e 's/^.*= //') diff --git a/pkg/rpm/Makefile.jsc11 b/pkg/rpm/Makefile.jsc11 index 38efa2a9..522e0bf2 100644 --- a/pkg/rpm/Makefile.jsc11 +++ b/pkg/rpm/Makefile.jsc11 @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc11= jsc11 MODULE_SUMMARY_jsc11= Java 11 module for NGINX Unit MODULE_VERSION_jsc11= $(VERSION) -MODULE_RELEASE_jsc11= 1 +MODULE_RELEASE_jsc11= 2 MODULE_CONFARGS_jsc11= java --module=java11 --home=/usr/lib/jvm/java-11 --lib-path=/usr/lib/jvm/jre-11/lib/server --jars=/usr/share/unit-jsc-common/ MODULE_MAKEARGS_jsc11= java11 diff --git a/pkg/rpm/Makefile.jsc8 b/pkg/rpm/Makefile.jsc8 index 58e2368b..59ba9b8d 100644 --- a/pkg/rpm/Makefile.jsc8 +++ b/pkg/rpm/Makefile.jsc8 @@ -4,7 +4,7 @@ MODULE_SUFFIX_jsc8= jsc8 MODULE_SUMMARY_jsc8= Java 8 module for NGINX Unit MODULE_VERSION_jsc8= $(VERSION) -MODULE_RELEASE_jsc8= 1 +MODULE_RELEASE_jsc8= 2 JAVA_ARCH_jsc8= $(shell /usr/lib/jvm/java-1.8.0/bin/java -XshowSettings 2>&1 | grep -F -e os.arch | sed -e 's/^.*= //') diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl index f59b7353..8f408247 100644 --- a/pkg/rpm/Makefile.perl +++ b/pkg/rpm/Makefile.perl @@ -4,7 +4,7 @@ MODULE_SUFFIX_perl= perl MODULE_SUMMARY_perl= Perl module for NGINX Unit MODULE_VERSION_perl= $(VERSION) -MODULE_RELEASE_perl= 1 +MODULE_RELEASE_perl= 2 MODULE_CONFARGS_perl= perl MODULE_MAKEARGS_perl= perl diff --git a/pkg/rpm/Makefile.php b/pkg/rpm/Makefile.php index 8f39efc0..9efa3ecf 100644 --- a/pkg/rpm/Makefile.php +++ b/pkg/rpm/Makefile.php @@ -4,7 +4,7 @@ MODULE_SUFFIX_php= php MODULE_SUMMARY_php= PHP module for NGINX Unit MODULE_VERSION_php= $(VERSION) -MODULE_RELEASE_php= 1 +MODULE_RELEASE_php= 2 MODULE_CONFARGS_php= php MODULE_MAKEARGS_php= php diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python index 334d62c1..4a1dfcad 100644 --- a/pkg/rpm/Makefile.python +++ b/pkg/rpm/Makefile.python @@ -4,7 +4,7 @@ MODULE_SUFFIX_python= python MODULE_SUMMARY_python= Python module for NGINX Unit MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 1 +MODULE_RELEASE_python= 2 MODULE_CONFARGS_python= python MODULE_MAKEARGS_python= python diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 index 95b392a9..add58d7b 100644 --- a/pkg/rpm/Makefile.python27 +++ b/pkg/rpm/Makefile.python27 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python27= python2.7 MODULE_SUMMARY_python27= Python 2.7 module for NGINX Unit MODULE_VERSION_python27= $(VERSION) -MODULE_RELEASE_python27= 1 +MODULE_RELEASE_python27= 2 MODULE_CONFARGS_python27= python --config=python2.7-config MODULE_MAKEARGS_python27= python2.7 diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34 index 83c0bdb6..75fc7085 100644 --- a/pkg/rpm/Makefile.python34 +++ b/pkg/rpm/Makefile.python34 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python34= python3.4 MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit MODULE_VERSION_python34= $(VERSION) -MODULE_RELEASE_python34= 1 +MODULE_RELEASE_python34= 2 MODULE_CONFARGS_python34= python --config=python3.4-config MODULE_MAKEARGS_python34= python3.4 diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 index 6f866771..fd4d0026 100644 --- a/pkg/rpm/Makefile.python35 +++ b/pkg/rpm/Makefile.python35 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python35= python3.5 MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit MODULE_VERSION_python35= $(VERSION) -MODULE_RELEASE_python35= 1 +MODULE_RELEASE_python35= 2 MODULE_CONFARGS_python35= python --config=python3.5-config MODULE_MAKEARGS_python35= python3.5 diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 index 25e33968..35df2e28 100644 --- a/pkg/rpm/Makefile.python36 +++ b/pkg/rpm/Makefile.python36 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python36= python3.6 MODULE_SUMMARY_python36= Python 3.6 module for NGINX Unit MODULE_VERSION_python36= $(VERSION) -MODULE_RELEASE_python36= 1 +MODULE_RELEASE_python36= 2 MODULE_CONFARGS_python36= python --config=python3.6-config MODULE_MAKEARGS_python36= python3.6 diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37 index ed9462b8..9d52628e 100644 --- a/pkg/rpm/Makefile.python37 +++ b/pkg/rpm/Makefile.python37 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python37= python3.7 MODULE_SUMMARY_python37= Python 3.7 module for NGINX Unit MODULE_VERSION_python37= $(VERSION) -MODULE_RELEASE_python37= 1 +MODULE_RELEASE_python37= 2 MODULE_CONFARGS_python37= python --config=python3.7-config MODULE_MAKEARGS_python37= python3.7 diff --git a/pkg/rpm/Makefile.ruby b/pkg/rpm/Makefile.ruby index 51c2949d..c34a193e 100644 --- a/pkg/rpm/Makefile.ruby +++ b/pkg/rpm/Makefile.ruby @@ -4,7 +4,7 @@ MODULE_SUFFIX_ruby= ruby MODULE_SUMMARY_ruby= Ruby module for NGINX Unit MODULE_VERSION_ruby= $(VERSION) -MODULE_RELEASE_ruby= 1 +MODULE_RELEASE_ruby= 2 MODULE_CONFARGS_ruby= ruby MODULE_MAKEARGS_ruby= ruby diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 2ef4ff1b..023ebfab 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 7fc950ec..afd2f1ff 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%%") |