external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Fix make -jN random failed.

Browse source
This commit is contained in:
winlin 2019-12-20 11:49:27 +08:00
parent 7f7b016b8e
commit cee4feda61
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/auto/apps.sh
View file

@ -23,6 +23,8 @@ echo "# build ${APP_TARGET}" >> ${FILE}
# generate the binary depends, for example: # generate the binary depends, for example:
# srs: objs/srs # srs: objs/srs
echo "${BUILD_KEY}: ${APP_TARGET}" >> ${FILE} echo "${BUILD_KEY}: ${APP_TARGET}" >> ${FILE}
echo "" >> ${FILE}
# the link commands, for example: # the link commands, for example:
# objs/srs: objs/src/core/srs_core.o # objs/srs: objs/src/core/srs_core.o
echo -n "${APP_TARGET}: " >> ${FILE} echo -n "${APP_TARGET}: " >> ${FILE}
@ -88,5 +90,6 @@ done
# link options. # link options.
echo -n "${LINK_OPTIONS}" >> ${FILE} echo -n "${LINK_OPTIONS}" >> ${FILE}
echo "" >> ${FILE} echo "" >> ${FILE}
echo "" >> ${FILE}
echo -n "Generate app ${APP_NAME} ok"; echo '!'; echo -n "Generate app ${APP_NAME} ok"; echo '!';

1
trunk/auto/libs.sh
View file

@ -19,6 +19,7 @@ echo "Generating lib ${LIB_NAME} depends."
echo "" >> ${FILE} echo "" >> ${FILE}
echo "# archive library ${LIB_TAGET_STATIC}" >> ${FILE} echo "# archive library ${LIB_TAGET_STATIC}" >> ${FILE}
echo "${BUILD_KEY}: ${LIB_TAGET_STATIC}" >> ${FILE} echo "${BUILD_KEY}: ${LIB_TAGET_STATIC}" >> ${FILE}
echo "" >> ${FILE}
# build depends # build depends
echo -n "${LIB_TAGET_STATIC}: " >> ${FILE} echo -n "${LIB_TAGET_STATIC}: " >> ${FILE}

4
trunk/configure vendored
View file

@ -429,13 +429,13 @@ for SRS_MODULE in ${SRS_MODULES[*]}; do
# if export librtmp, donot build the bravo-ingest. # if export librtmp, donot build the bravo-ingest.
if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then
cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
$SRS_MODULE_NAME: _prepare_dir $SRS_MODULE_NAME: _prepare_dir server
@echo "Ingore the $SRS_MODULE_NAME for srs-librtmp" @echo "Ingore the $SRS_MODULE_NAME for srs-librtmp"
END END
else else
cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
$SRS_MODULE_NAME: _prepare_dir $SRS_MODULE_NAME: _prepare_dir server
@echo "Build the $SRS_MODULE_NAME over SRS" @echo "Build the $SRS_MODULE_NAME over SRS"
\$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} $SRS_MODULE_NAME \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} $SRS_MODULE_NAME