mirror of
https://github.com/ossrs/srs.git
synced 2025-02-15 04:42:04 +00:00
Copy 4.0release
This commit is contained in:
parent
5207e90a2a
commit
b6234a9c88
2 changed files with 3 additions and 3 deletions
|
@ -514,12 +514,12 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then
|
|||
fi
|
||||
# Which openssl we choose, openssl-1.0.* for SRTP with ASM, others we use openssl-1.1.*
|
||||
OPENSSL_CANDIDATE="openssl-1.1.0e" && OPENSSL_UNZIP="unzip -q ../../3rdparty/$OPENSSL_CANDIDATE.zip"
|
||||
if [[ $SRS_SRTP_ASM == YES ]]; then
|
||||
if [[ $SRS_SSL_1_0 == YES ]]; then
|
||||
OPENSSL_CANDIDATE="openssl-OpenSSL_1_0_2u" && OPENSSL_UNZIP="tar xf ../../3rdparty/$OPENSSL_CANDIDATE.tar.gz"
|
||||
fi
|
||||
# cross build not specified, if exists flag, need to rebuild for no-arm platform.
|
||||
if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then
|
||||
echo "Openssl-1.1.0e is ok.";
|
||||
echo "The $OPENSSL_CANDIDATE is ok.";
|
||||
else
|
||||
echo "Building $OPENSSL_CANDIDATE.";
|
||||
(
|
||||
|
|
|
@ -35,7 +35,7 @@ SRS_GPROF=NO # Performance test: gprof
|
|||
SRS_STREAM_CASTER=YES
|
||||
SRS_INGEST=YES
|
||||
SRS_SSL=YES
|
||||
SRS_SSL_1_0=NO
|
||||
SRS_SSL_1_0=YES
|
||||
SRS_HTTPS=YES
|
||||
SRS_STAT=YES
|
||||
SRS_TRANSCODE=YES
|
||||
|
|
Loading…
Reference in a new issue