Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-10-26 13:29:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
45385241bbafff6f705d351ca57707aaad2fedd9
45385241
1 parent
95d38b7b
fix the sed command for arm
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
5 行删除
trunk/auto/depends.sh
trunk/auto/generate-srs-librtmp-single.sh
trunk/auto/setup_variables.sh
trunk/auto/depends.sh
查看文件 @
4538524
...
...
@@ -513,7 +513,7 @@ if [ $__SRS_BUILD_NGINX = YES ]; then
# srs will write ts/m3u8 file use current user,
# nginx default use nobody, so cannot read the ts/m3u8 created by srs.
cp
${
SRS_OBJS
}
/nginx/conf/nginx.conf
${
SRS_OBJS
}
/nginx/conf/nginx.conf.bk
$SED
''
"s/^.user nobody;/user
`
whoami
`
;/g"
${
SRS_OBJS
}
/nginx/conf/nginx.conf
$SED
"s/^.user nobody;/user
`
whoami
`
;/g"
${
SRS_OBJS
}
/nginx/conf/nginx.conf
fi
# the demo dir.
...
...
trunk/auto/generate-srs-librtmp-single.sh
查看文件 @
4538524
...
...
@@ -7,10 +7,6 @@ ret=$?; if [[ 0 -eq $ret ]]; then
fi
echo
"Is OSX:
${
OS_IS_OSX
}
"
# the sed command
SED
=
"sed -i"
if
[
$OS_IS_OSX
=
YES
]
;
then
SED
=
"sed -i ''"
;
fi
# when export srs-librtmp single files
# package the whole project to srs_librtmp.h and srs_librtmp.cpp
#
...
...
trunk/auto/setup_variables.sh
查看文件 @
4538524
...
...
@@ -28,3 +28,7 @@ if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi
if
[[
-z
$SrsArmAR
]]
;
then
SrsArmAR
=
$__SrsArmAR
;
fi
if
[[
-z
$SrsArmLD
]]
;
then
SrsArmLD
=
$__SrsArmLD
;
fi
if
[[
-z
$SrsArmRANDLIB
]]
;
then
SrsArmRANDLIB
=
$__SrsArmRANDLIB
;
fi
# the sed command
SED
=
"sed -i"
if
[
$OS_IS_OSX
=
YES
]
;
then
SED
=
"sed -i ''"
;
fi
...
...
请
注册
或
登录
后发表评论