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 bug of arm build script__SRS_BUILD_NGINX=NO

Browse source
This commit is contained in:
winlin 2014-03-17 10:48:44 +08:00
parent 4235e9ae34
commit 421fbd4c3e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trunk/auto/depends.sh
View file

@ -217,7 +217,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
fi fi
else else
# arm not specified, if exists flag, need to rebuild for no-arm platform. # arm not specified, if exists flag, need to rebuild for no-arm platform.
if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st-1.9/obj/libst.a && -f ${SRS_OBJS}/st-1.9/obj/libst.so ]]; then if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st-1.9/obj/libst.a && -f ${SRS_OBJS}/st-1.9/obj/libst.so ]]; then
echo "st-1.9t is ok."; echo "st-1.9t is ok.";
else else
echo "build st-1.9t"; echo "build st-1.9t";
@ -271,6 +271,7 @@ function write_nginx_html5()
</video> </video>
END END
} }
__SRS_BUILD_NGINX=NO; if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_ARM_UBUNTU12 = NO ]; then
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then
if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then