external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

fix linux config openssl bug.

Browse source
This commit is contained in:
winlin 2014-08-17 19:43:53 +08:00
parent 5e4dad210a
commit 554a9763db
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
trunk/auto/depends.sh
View file

@ -555,8 +555,10 @@ fi
# openssl, for rtmp complex handshake # openssl, for rtmp complex handshake
##################################################################################### #####################################################################################
# extra configure options # extra configure options
CONFIGURE_TOOL="./config"
EXTRA_CONFIGURE="" EXTRA_CONFIGURE=""
if [ $SRS_OSX = YES ]; then if [ $SRS_OSX = YES ]; then
CONFIGURE_TOOL="./Configure"
arch=`uname -m` && echo "OSX $arch"; arch=`uname -m` && echo "OSX $arch";
if [ $arch = x86_64 ]; then if [ $arch = x86_64 ]; then
echo "configure 64bit openssl"; echo "configure 64bit openssl";
@ -565,7 +567,10 @@ if [ $SRS_OSX = YES ]; then
echo "configure 32bit openssl"; echo "configure 32bit openssl";
EXTRA_CONFIGURE=darwin-i386-cc EXTRA_CONFIGURE=darwin-i386-cc
fi fi
echo "openssl extra config options: $EXTRA_CONFIGURE" echo "openssl extra config: $CONFIGURE_TOOL $EXTRA_CONFIGURE"
fi
if [ $SRS_EMBEDED_CPU = YES ]; then
CONFIGURE_TOOL="./Configure"
fi fi
# @see http://www.openssl.org/news/secadv_20140407.txt # @see http://www.openssl.org/news/secadv_20140407.txt
# Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately
@ -584,7 +589,7 @@ if [ $SRS_SSL = YES ]; then
( (
rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} && $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} &&
make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \ make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \
LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} &&
make install_sw && make install_sw &&
@ -601,7 +606,7 @@ if [ $SRS_SSL = YES ]; then
( (
rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
./Configure --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} && $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} &&
make && make install_sw && make && make install_sw &&
cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl &&
cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp