mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
fix ssl make install on ubuntu 14, change to make install_sw
This commit is contained in:
parent
bfeb24c52b
commit
594c1d8bf7
1 changed files with 2 additions and 2 deletions
|
@ -495,7 +495,7 @@ if [ $SRS_SSL = YES ]; then
|
||||||
./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS &&
|
./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS &&
|
||||||
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 &&
|
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 .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp
|
cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp
|
||||||
)
|
)
|
||||||
|
@ -510,7 +510,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 &&
|
||||||
./config --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS &&
|
./config --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS &&
|
||||||
make && make install &&
|
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
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue