Skip to content

Commit 1295ff2

Browse files
committed
Adjusted spec files to honor SYSTEM_SSL setting determined in compile-options script
This applies to redhat > 7 and suse >= 15 Ticket: ENT-12528 Changelog: none
1 parent c53d3f9 commit 1295ff2

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

deps-packaging/libcurl/cfbuild-libcurl.spec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ AutoReqProv: no
1818
mkdir -p %{_builddir}
1919
%setup -q -n curl-%{curl_version}
2020

21-
# we don't bundle OpenSSL on RHEL 8 (and newer in the future)
22-
%if %{?rhel}%{!?rhel:0} > 7
23-
%define ssl_prefix /usr
24-
%else
21+
if [ -z "$SYSTEM_SSL" ]; then
2522
%define ssl_prefix %{prefix}
26-
%endif
23+
else
24+
%define ssl_prefix /usr
25+
fi
2726

2827
./configure \
2928
--with-sysroot=%{prefix} \

0 commit comments

Comments
 (0)