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
2014-03-19 12:18:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
efa22074be37e05a0de10f132aea64788d5d1827
efa22074
1 parent
e0e451b6
always use static link, for manually build arm, and x86/64 use static link is ok.
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
9 行增加
和
9 行删除
trunk/auto/depends.sh
trunk/configure
trunk/auto/depends.sh
查看文件 @
efa2207
...
...
@@ -201,7 +201,7 @@ Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then "CentOS perfapre failed, ret=$
# check the arm flag file, if flag changed, need to rebuild the st.
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
# ok, arm specified, if the flag filed does not exists, need to rebuild.
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
if
[[
-f
${
SRS_OBJS
}
/_flag.st.arm.tmp
&&
-f
${
SRS_OBJS
}
/st
/libst.a
&&
-f
${
SRS_OBJS
}
/st
/libst.so
]]
;
then
echo
"st-1.9t for arm is ok."
;
else
# TODO: FIXME: patch the bug.
...
...
@@ -218,7 +218,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
fi
else
# arm not specified, if exists flag, need to rebuild for no-arm platform.
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
if
[[
! -f
${
SRS_OBJS
}
/_flag.st.arm.tmp
&&
-f
${
SRS_OBJS
}
/st
/libst.a
&&
-f
${
SRS_OBJS
}
/st
/libst.so
]]
;
then
echo
"st-1.9t is ok."
;
else
echo
"build st-1.9t"
;
...
...
@@ -233,14 +233,14 @@ else
fi
# check status
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
echo
"build st-1.9 failed, ret=
$ret
"
;
exit
$ret
;
fi
if
[
! -f
${
SRS_OBJS
}
/st-1.9/obj/libst.a
]
;
then
echo
"build st-1.9 failed."
;
exit
-1;
fi
if
[
! -f
${
SRS_OBJS
}
/st-1.9/obj/libst.so
]
;
then
echo
"build st-1.9 failed."
;
exit
-1;
fi
if
[
! -f
${
SRS_OBJS
}
/st/libst.a
]
;
then
echo
"build st-1.9 failed."
;
exit
-1;
fi
if
[
! -f
${
SRS_OBJS
}
/st/libst.so
]
;
then
echo
"build st-1.9 failed."
;
exit
-1;
fi
#####################################################################################
# http-parser-2.1
#####################################################################################
if
[
$SRS_HTTP_CALLBACK
=
YES
]
;
then
if
[[
-f
${
SRS_OBJS
}
/h
ttp-parser-2.1/http_parser.h
&&
-f
${
SRS_OBJS
}
/http-parser-2.1
/libhttp_parser.a
]]
;
then
if
[[
-f
${
SRS_OBJS
}
/h
p/http_parser.h
&&
-f
${
SRS_OBJS
}
/hp
/libhttp_parser.a
]]
;
then
echo
"http-parser-2.1 is ok."
;
else
echo
"build http-parser-2.1"
;
...
...
@@ -255,8 +255,8 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then
fi
# check status
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
echo
"build http-parser-2.1 failed, ret=
$ret
"
;
exit
$ret
;
fi
if
[[
! -f
${
SRS_OBJS
}
/http-parser-2.1/http_parser.h
]]
;
then
echo
"build http-parser-2.1 failed"
;
exit
-1;
fi
if
[[
! -f
${
SRS_OBJS
}
/http-parser-2.1/libhttp_parser.a
]]
;
then
echo
"build http-parser-2.1 failed"
;
exit
-1;
fi
if
[[
! -f
${
SRS_OBJS
}
/hp/http_parser.h
]]
;
then
echo
"build http-parser-2.1 failed"
;
exit
-1;
fi
if
[[
! -f
${
SRS_OBJS
}
/hp/libhttp_parser.a
]]
;
then
echo
"build http-parser-2.1 failed"
;
exit
-1;
fi
fi
#####################################################################################
...
...
trunk/configure
查看文件 @
efa2207
...
...
@@ -316,8 +316,8 @@ if [ $SRS_SSL = YES ]; then LibSSLRoot="${SRS_OBJS}/openssl/include"; LibSSLfile
# gperftools-2.1, for mem check and mem/cpu profile
LibGperfRoot
=
""
;
LibGperfFile
=
""
if
[
$SRS_GPERF
=
YES
]
;
then
LibGperfRoot
=
"
${
SRS_OBJS
}
/gperf/include"
;
LibGperfFile
=
"
${
SRS_OBJS
}
/gperf/lib/libtcmalloc_and_profiler.a"
;
fi
# the link options, if arm, use static link
SrsLinkOptions
=
"-ldl"
;
if
[
$SRS_ARM_UBUNTU12
=
YES
]
;
then
SrsLinkOptions
=
"-ldl -static"
;
fi
# the link options, always use static link
SrsLinkOptions
=
"-static"
#####################################################################################
# Modules, compile each module, then link to binary
...
...
请
注册
或
登录
后发表评论