Skip to content

Commit

Permalink
Only use packaged OpenSSL 1.1.1 if system OpenSSL 3 is not available.
Browse files Browse the repository at this point in the history
  • Loading branch information
MirahImage committed Sep 19, 2023
1 parent 79dda50 commit 448e1ea
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions packages/erlang-25/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ VERSION="25.3.2.6"
MAJOR_VERSION="25"
echo "$MAJOR_VERSION" > "$BOSH_INSTALL_TARGET/erlang_version"

openssl_major_version="$(openssl version | awk '{print $2}' | cut -d "." -f 1)"
if [ "$openssl_major_version" = "3" ]; then
openssl_flags=""
else
openssl_flags="--with-ssl=/var/vcap/packages/openssl/external/openssl/ --with-ssl-rpath=/var/vcap/packages/openssl/external/openssl/lib/"
fi

tar xzf erlang-25/otp_src_oss_${VERSION}.tgz
cd otp_src_oss_${VERSION}
./configure \
--with-ssl="/var/vcap/packages/openssl/external/openssl/" \
--with-ssl-rpath="/var/vcap/packages/openssl/external/openssl/lib/" \
$openssl_flags \
--disable-hipe \
--disable-sctp \
--disable-silent-rules \
Expand Down Expand Up @@ -44,8 +50,7 @@ cd otp_src_oss_${VERSION}
--without-ssh \
--without-tftp \
--without-wx \
--prefix=${BOSH_INSTALL_TARGET}
--prefix=${BOSH_INSTALL_TARGET}

make -j$cpus
make install

0 comments on commit 448e1ea

Please sign in to comment.