diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2020-11-24 14:27:06 +0300 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2020-11-24 14:27:06 +0300 |
| commit | a5fa9673d98c9c814c01ddfce8bcfbec6fcc02e8 (patch) | |
| tree | 88d882f4c81b3a4fdaaf97ada3679e1a28a0147b | |
| parent | 9c09bc17726ccb2ab769faec6aacbe38db1b2e0f (diff) | |
| download | unit-a5fa9673d98c9c814c01ddfce8bcfbec6fcc02e8.tar.gz unit-a5fa9673d98c9c814c01ddfce8bcfbec6fcc02e8.tar.bz2 | |
Packages: added pcre2 to build depends.
While at it, propagate unit build depends to modules.
| -rw-r--r-- | pkg/deb/debian.module/control.in | 4 | ||||
| -rw-r--r-- | pkg/deb/debian/control | 3 | ||||
| -rw-r--r-- | pkg/rpm/unit.module.spec.in | 11 | ||||
| -rw-r--r-- | pkg/rpm/unit.spec.in | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in index e9b8b8e2..7e28f5e9 100644 --- a/pkg/deb/debian.module/control.in +++ b/pkg/deb/debian.module/control.in @@ -3,7 +3,9 @@ Section: admin Priority: extra Maintainer: Andrei Belov <defan@nginx.com> Build-Depends: debhelper (>= 9), - linux-libc-dev%%MODULE_BUILD_DEPENDS%% + linux-libc-dev, + libssl-dev, + libpcre2-dev%%MODULE_BUILD_DEPENDS%% Standards-Version: 3.9.5 Homepage: https://unit.nginx.org diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index 9828b6ab..a8e8cdc4 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -4,7 +4,8 @@ Priority: extra Maintainer: Andrei Belov <defan@nginx.com> Build-Depends: debhelper (>= 9), linux-libc-dev, - libssl-dev + libssl-dev, + libpcre2-dev Standards-Version: 3.9.5 Homepage: https://unit.nginx.org diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 2ef4ff1b..39083e66 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -7,6 +7,15 @@ %define dist .el7 %endif +%if 0%{?rhel}%{?fedora} +BuildRequires: gcc +BuildRequires: openssl-devel +%endif + +%if 0%{?suse_version} >= 1315 +BuildRequires: libopenssl-devel +%endif + %define unit_version %%UNIT_VERSION%% %define unit_release %%UNIT_RELEASE%%%{?dist}.ngx @@ -29,6 +38,8 @@ Source0: unit-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pcre2-devel + Requires: unit == %%UNIT_VERSION%%-%%UNIT_RELEASE%%%{?dist}.ngx %description diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index f2a77b61..506d1964 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -45,6 +45,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +BuildRequires: pcre2-devel + %description NGINX Unit is a runtime and delivery environment for modern distributed applications. It runs the application code in multiple languages |