1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00

patch st and srs for arm build, allow user to specifies the gcc/g++

This commit is contained in:
winlin 2014-03-01 00:17:41 +08:00
parent 7fa031e7fb
commit ac3be10435
4 changed files with 33 additions and 4 deletions

21
trunk/3rdparty/1.st.arm.Makefile.patch vendored Normal file
View file

@ -0,0 +1,21 @@
Common subdirectories: st-1.9/docs and st-1.9.patch/docs
Common subdirectories: st-1.9/examples and st-1.9.patch/examples
Common subdirectories: st-1.9/extensions and st-1.9.patch/extensions
diff -u st-1.9/Makefile st-1.9.patch/Makefile
--- st-1.9/Makefile 2009-10-02 06:55:03.000000000 +0800
+++ st-1.9.patch/Makefile 2014-02-28 23:38:39.298697732 +0800
@@ -57,10 +57,10 @@
# possible compilation options.
##########################
-CC = cc
-AR = ar
-LD = ld
-RANLIB = ranlib
+CC ?= cc
+AR ?= ar
+LD ?= ld
+RANLIB ?= ranlib
LN = ln
SHELL = /bin/sh

View file

@ -24,6 +24,9 @@ x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
tools/ccache-3.1.9.zip
to fast build.
1.st.arm.Makefile.patch
st编译脚本补丁允许用户指定cc编译器。
links:
ffmpeg:

View file

@ -181,7 +181,9 @@ else
echo "build st-1.9t";
(
rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && make linux-debug &&
unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
patch -p1 < ../../3rdparty/1.st.arm.Makefile.patch &&
make linux-debug &&
cd .. && rm -f st && ln -sf st-1.9/obj st
)
fi
@ -349,7 +351,8 @@ 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 && make install &&
./config --prefix=`pwd`/_release -no-shared &&
make && make install &&
cd .. && ln -sf openssl-1.0.1f/_release openssl
)
fi

6
trunk/configure vendored
View file

@ -82,10 +82,12 @@ CppStd="-ansi"
CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug}"
#CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug} ${Performance}"
cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
CXXFLAGS ?= ${CXXFLAGS}
CC ?= gcc
GCC ?= gcc
CXX ?= g++
LINK ?= \$(CXX)
AR ?= ar
CXXFLAGS = ${CXXFLAGS}
LINK = g++
.PHONY: default srs bandwidth