正在显示
1 个修改的文件
包含
3 行增加
和
3 行删除
| @@ -373,7 +373,7 @@ fi | @@ -373,7 +373,7 @@ fi | ||
| 373 | ##################################################################################### | 373 | ##################################################################################### |
| 374 | if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | 374 | if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then |
| 375 | # check the arm flag file, if flag changed, need to rebuild the st. | 375 | # check the arm flag file, if flag changed, need to rebuild the st. |
| 376 | - _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_EPOLL" | 376 | + _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="EXTRA_CFLAGS=-DMD_HAVE_EPOLL" |
| 377 | # for osx, use darwin for st, donot use epoll. | 377 | # for osx, use darwin for st, donot use epoll. |
| 378 | if [ $OS_IS_OSX = YES ]; then | 378 | if [ $OS_IS_OSX = YES ]; then |
| 379 | _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="" | 379 | _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="" |
| @@ -392,8 +392,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | @@ -392,8 +392,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then | ||
| 392 | rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && | 392 | rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && |
| 393 | unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && | 393 | unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && |
| 394 | patch -p0 -R < ../../3rdparty/patches/1.st.arm.patch && | 394 | patch -p0 -R < ../../3rdparty/patches/1.st.arm.patch && |
| 395 | - make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} \ | ||
| 396 | - EXTRA_CFLAGS=${_ST_EXTRA_CFLAGS} ${_ST_MAKE} && | 395 | + make ${_ST_MAKE} CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} \ |
| 396 | + EXTRA_CFLAGS=${_ST_EXTRA_CFLAGS} && | ||
| 397 | cd .. && rm -rf st && ln -sf st-1.9/obj st && | 397 | cd .. && rm -rf st && ln -sf st-1.9/obj st && |
| 398 | cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp | 398 | cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp |
| 399 | ) | 399 | ) |
-
请 注册 或 登录 后发表评论