technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: enabled OpenSSL support.

Browse Source
This commit is contained in:
Andrei Belov
2018-09-20 16:14:29 +03:00
parent 510c2e15c5
commit fea05e3065
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/deb/Makefile
View File

@@ -12,7 +12,7 @@ SRCDIR= unit-$(VERSION)
CODENAME = $(shell lsb_release -cs) CODENAME = $(shell lsb_release -cs)
BUILD_DEPENDS_unit = build-essential debhelper devscripts fakeroot libxml2-utils lintian lsb-release xsltproc BUILD_DEPENDS_unit = build-essential debhelper devscripts fakeroot libxml2-utils lintian lsb-release xsltproc libssl-dev
BUILD_DEPENDS = $(BUILD_DEPENDS_unit) BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
MODULES= MODULES=
@@ -93,7 +93,8 @@ CONFIGURE_ARGS=\
--control="unix:/var/run/control.unit.sock" \ --control="unix:/var/run/control.unit.sock" \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tests --tests \
--openssl
export CR=\\n export CR=\\n

3
pkg/deb/debian/control
View File

@@ -3,7 +3,8 @@ Section: admin
Priority: extra Priority: extra
Maintainer: Andrei Belov <defan@nginx.com> Maintainer: Andrei Belov <defan@nginx.com>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
linux-libc-dev linux-libc-dev,
libssl-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: https://unit.nginx.org Homepage: https://unit.nginx.org

7
pkg/rpm/Makefile
View File

@@ -37,9 +37,9 @@ BUILD_DEPENDS_unit += system-rpm-config
endif endif
ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles))
BUILD_DEPENDS_unit += libxml2-tools libxslt1 BUILD_DEPENDS_unit += libxml2-tools libxslt1 libopenssl-devel
else else
BUILD_DEPENDS_unit += libxml2 libxslt BUILD_DEPENDS_unit += libxml2 libxslt openssl-devel
endif endif
BUILD_DEPENDS = $(BUILD_DEPENDS_unit) BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
@@ -101,7 +101,8 @@ CONFIGURE_ARGS=\
--control="unix:/var/run/control.unit.sock" \ --control="unix:/var/run/control.unit.sock" \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tests --tests \
--openssl
export CR=\\n export CR=\\n

5
pkg/rpm/unit.spec.in
View File

@@ -5,19 +5,22 @@
%if ( 0%{?rhel} == 5 || 0%{?rhel} == 6 ) %if ( 0%{?rhel} == 5 || 0%{?rhel} == 6 )
Requires: initscripts >= 8.36 Requires: initscripts >= 8.36
BuildRequires: openssl-devel
%endif %endif
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
Requires: systemd Requires: systemd
BuildRequires: systemd-units BuildRequires: systemd-units
BuildRequires: openssl-devel
%if 0%{?amzn} == 0 %if 0%{?amzn} == 0
%define dist .el7 %define dist .el7
%endif %endif
%endif %endif
%if 0%{?suse_version} == 1315 %if 0%{?suse_version} >= 1315
BuildRequires: systemd BuildRequires: systemd
Requires: systemd Requires: systemd
BuildRequires: libopenssl-devel
%endif %endif
%define CC_OPT %{optflags} -fPIC %define CC_OPT %{optflags} -fPIC