diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2024-12-19 10:23:57 -0800 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2024-12-19 10:23:57 -0800 |
| commit | d8acad350a52a20918c46c09cb0a0f5479400923 (patch) | |
| tree | 7d9c4b64daa60d3ac121743dfa3735c6fc5687a4 /pkg/rpm/unit.spec.in | |
| parent | 624debcf17ea7faab01fa841bd4dcd9f308cf306 (diff) | |
| parent | 27bde184dedcbf687db2f314c60c037623318a8d (diff) | |
| download | unit-d8acad350a52a20918c46c09cb0a0f5479400923.tar.gz unit-d8acad350a52a20918c46c09cb0a0f5479400923.tar.bz2 | |
Merge tag '1.34.0' into packaging1.34.0-1
Unit 1.34.0 release.
Diffstat (limited to 'pkg/rpm/unit.spec.in')
| -rw-r--r-- | pkg/rpm/unit.spec.in | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 9360ff7e..fc3feb14 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -76,6 +76,13 @@ Library and include files required for NGINX Unit modules development. %build %{__make} %{?_smp_mflags} -C pkg/contrib .njs +# openssl-sys rust crate doesnt detect openssl11.pc in Amazon Linux 2, so needs +# a bit of a helping hand. +%if (0%{?amzn2}) +export OPENSSL_LIB_DIR=%_libdir +export OPENSSL_INCLUDE_DIR=%_includedir +%endif + PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ ./configure \ %{CONFIGURE_ARGS} \ @@ -84,7 +91,7 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ --cc-opt="%{CC_OPT}" \ --ld-opt="%{LD_OPT}" \ --debug -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} E=0 %{__make} %{?_smp_mflags} build/lib/libunit.a %{__mv} build build-debug @@ -95,7 +102,7 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ --libdir=%{_libdir} \ --cc-opt="%{CC_OPT}" \ --ld-opt="%{LD_OPT}" -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} E=0 %{__mv} build build-nodebug %if (0%{?fedora}) || (0%{?rhel} >= 8) || (0%{?amzn2}) @@ -103,8 +110,15 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ %endif %install +# openssl-sys rust crate doesnt detect openssl11.pc in Amazon Linux 2, so needs +# a bit of a helping hand. +%if (0%{?amzn2}) +export OPENSSL_LIB_DIR=%_libdir +export OPENSSL_INCLUDE_DIR=%_includedir +%endif + %{__ln_s} build-nodebug build -DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install +DESTDIR=%{buildroot} make unitd-install libunit-install manpage-install E=0 %{__mkdir} -p %{buildroot}%{_bindir} %{__install} -m755 %{bdir}/tools/unitc \ %{buildroot}%{_bindir}/unitc |