external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

build openssl for osx, for bug #155.

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

17
trunk/auto/depends.sh
View file

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

2
trunk/auto/options.sh
View file

@ -590,7 +590,7 @@ function apply_user_presets() {
SRS_HLS=YES
SRS_DVR=YES
SRS_NGINX=NO
SRS_SSL=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_TRANSCODE=YES
SRS_INGEST=NO

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "196"
#define VERSION_REVISION "197"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"