正在显示
1 个修改的文件
包含
8 行增加
和
3 行删除
| @@ -555,8 +555,10 @@ fi | @@ -555,8 +555,10 @@ fi | ||
| 555 | # openssl, for rtmp complex handshake | 555 | # openssl, for rtmp complex handshake |
| 556 | ##################################################################################### | 556 | ##################################################################################### |
| 557 | # extra configure options | 557 | # extra configure options |
| 558 | +CONFIGURE_TOOL="./config" | ||
| 558 | EXTRA_CONFIGURE="" | 559 | EXTRA_CONFIGURE="" |
| 559 | if [ $SRS_OSX = YES ]; then | 560 | if [ $SRS_OSX = YES ]; then |
| 561 | + CONFIGURE_TOOL="./Configure" | ||
| 560 | arch=`uname -m` && echo "OSX $arch"; | 562 | arch=`uname -m` && echo "OSX $arch"; |
| 561 | if [ $arch = x86_64 ]; then | 563 | if [ $arch = x86_64 ]; then |
| 562 | echo "configure 64bit openssl"; | 564 | echo "configure 64bit openssl"; |
| @@ -565,7 +567,10 @@ if [ $SRS_OSX = YES ]; then | @@ -565,7 +567,10 @@ if [ $SRS_OSX = YES ]; then | ||
| 565 | echo "configure 32bit openssl"; | 567 | echo "configure 32bit openssl"; |
| 566 | EXTRA_CONFIGURE=darwin-i386-cc | 568 | EXTRA_CONFIGURE=darwin-i386-cc |
| 567 | fi | 569 | fi |
| 568 | - echo "openssl extra config options: $EXTRA_CONFIGURE" | 570 | + echo "openssl extra config: $CONFIGURE_TOOL $EXTRA_CONFIGURE" |
| 571 | +fi | ||
| 572 | +if [ $SRS_EMBEDED_CPU = YES ]; then | ||
| 573 | + CONFIGURE_TOOL="./Configure" | ||
| 569 | fi | 574 | fi |
| 570 | # @see http://www.openssl.org/news/secadv_20140407.txt | 575 | # @see http://www.openssl.org/news/secadv_20140407.txt |
| 571 | # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately | 576 | # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately |
| @@ -584,7 +589,7 @@ if [ $SRS_SSL = YES ]; then | @@ -584,7 +589,7 @@ if [ $SRS_SSL = YES ]; then | ||
| 584 | ( | 589 | ( |
| 585 | rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && | 590 | rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && |
| 586 | unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && | 591 | unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && |
| 587 | - ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} && | 592 | + $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm linux-armv4 -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} && |
| 588 | make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \ | 593 | make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \ |
| 589 | LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && | 594 | LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && |
| 590 | make install_sw && | 595 | make install_sw && |
| @@ -601,7 +606,7 @@ if [ $SRS_SSL = YES ]; then | @@ -601,7 +606,7 @@ if [ $SRS_SSL = YES ]; then | ||
| 601 | ( | 606 | ( |
| 602 | rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && | 607 | rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && |
| 603 | unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && | 608 | unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && |
| 604 | - ./Configure --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} && | 609 | + $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared -DOPENSSL_NO_HEARTBEATS ${EXTRA_CONFIGURE} && |
| 605 | make && make install_sw && | 610 | make && make install_sw && |
| 606 | cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && | 611 | cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && |
| 607 | cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp | 612 | cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp |
-
请 注册 或 登录 后发表评论