diff --git a/trunk/auto/build_ffmpeg.sh b/trunk/auto/build_ffmpeg.sh index 551ed683d..23949abad 100755 --- a/trunk/auto/build_ffmpeg.sh +++ b/trunk/auto/build_ffmpeg.sh @@ -28,7 +28,7 @@ else cd $ff_current_dir && rm -rf yasm-1.2.0 && unzip -q ${ff_src_dir}/yasm-1.2.0.zip && cd yasm-1.2.0 && ./configure --prefix=${ff_release_dir} && - make ${SRS_JOBS} && make install + make && make install ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build yasm-1.2.0 failed"; exit 1; fi fi # add yasm to path, for x264 to use yasm directly. @@ -43,7 +43,7 @@ else cd $ff_current_dir && rm -rf libaacplus-2.0.2 && unzip -q ${ff_src_dir}/libaacplus-2.0.2.zip && cd libaacplus-2.0.2 && cp ../${ff_src_dir}/libaacplus-patch-26410-800.zip src/26410-800.zip && - bash autogen.sh && ./configure --prefix=${ff_release_dir} --enable-static && make ${SRS_JOBS} && make install + bash autogen.sh && ./configure --prefix=${ff_release_dir} --enable-static && make && make install ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build libaacplus-2.0.2 failed"; exit 1; fi fi diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh old mode 100644 new mode 100755 index 784310b27..fa63ed563 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -1,5 +1,8 @@ #!/bin/bash +# variables: +# SRS_JOBS: the build jobs, parent script must set it. + ##################################################################################### ##################################################################################### # prepare the depends tools and libraries @@ -183,7 +186,7 @@ else rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && patch -p1 < ../../3rdparty/1.st.arm.Makefile.patch && - make linux-debug ${SRS_JOBS}&& + make linux-debug && cd .. && rm -f st && ln -sf st-1.9/obj st ) fi @@ -205,7 +208,7 @@ if [ $SRS_HTTP = YES ]; then cd http-parser-2.1 && sed -i "s/CPPFLAGS_FAST +=.*$/CPPFLAGS_FAST = \$\(CPPFLAGS_DEBUG\)/g" Makefile && sed -i "s/CFLAGS_FAST =.*$/CFLAGS_FAST = \$\(CFLAGS_DEBUG\)/g" Makefile && - make package ${SRS_JOBS} && + make package && cd .. && rm -f hp && ln -sf http-parser-2.1 hp ) fi @@ -352,7 +355,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 && - make ${SRS_JOBS} && make install && + make && make install && cd .. && ln -sf openssl-1.0.1f/_release openssl ) fi diff --git a/trunk/configure b/trunk/configure index 034de0b0b..2906f94c6 100755 --- a/trunk/configure +++ b/trunk/configure @@ -15,7 +15,9 @@ YELLOW="\\e[33m" BLACK="\\e[0m" ##################################################################################### -# parse user options, set the variables like SRS_SSL/SRS_HLS/SRS_FFMPEG/SRS_HTTP +# parse user options, set the variables like: +# srs features: SRS_SSL/SRS_HLS/SRS_FFMPEG/SRS_HTTP/SRS_RESEARCH/SRS_UTEST +# build options: SRS_JOBS ##################################################################################### # parse options, exit with error when parse options invalid. . auto/options.sh