Skip to content

Commit 8649cfb

Browse files
committed
squashme, better to explicitly set a value, easier to use with rpm define argument
1 parent 1bb5e60 commit 8649cfb

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

build-scripts/compile-options

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ export PROJECT
3636
# Otherwise, we build it.
3737
if [ x"$SYSTEM_SSL" = x ]
3838
then
39+
# default to using cfengine openssl
40+
SYSTEM_SSL=0
3941
# We don't bundle OpenSSL on some redhat-derived systems due to incompatability with libpam and our openssl.
4042
_OS_MAJOR_VERSION="$(echo "$OS_VERSION" | cut -d. -f1)"
4143
if [ "$OS" = "rhel" ] && expr "$_OS_MAJOR_VERSION" ">=" "8" >/dev/null

deps-packaging/libcurl/cfbuild-libcurl.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ AutoReqProv: no
1818
mkdir -p %{_builddir}
1919
%setup -q -n curl-%{curl_version}
2020

21-
%if "%{defined _system_ssl}"
21+
%if "%{_system_ssl}" == "1"
2222
%define ssl_prefix /usr
2323
%else
2424
%define ssl_prefix %{prefix}

0 commit comments

Comments
 (0)