winlin

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

  1 +Common subdirectories: st-1.9/docs and st-1.9.patch/docs
  2 +Common subdirectories: st-1.9/examples and st-1.9.patch/examples
  3 +Common subdirectories: st-1.9/extensions and st-1.9.patch/extensions
  4 +diff -u st-1.9/Makefile st-1.9.patch/Makefile
  5 +--- st-1.9/Makefile 2009-10-02 06:55:03.000000000 +0800
  6 ++++ st-1.9.patch/Makefile 2014-02-28 23:38:39.298697732 +0800
  7 +@@ -57,10 +57,10 @@
  8 + # possible compilation options.
  9 + ##########################
  10 +
  11 +-CC = cc
  12 +-AR = ar
  13 +-LD = ld
  14 +-RANLIB = ranlib
  15 ++CC ?= cc
  16 ++AR ?= ar
  17 ++LD ?= ld
  18 ++RANLIB ?= ranlib
  19 + LN = ln
  20 +
  21 + SHELL = /bin/sh
@@ -24,6 +24,9 @@ x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) @@ -24,6 +24,9 @@ x264-snapshot-20131129-2245-stable.tar.bz2 (core.138)
24 24
25 tools/ccache-3.1.9.zip 25 tools/ccache-3.1.9.zip
26 to fast build. 26 to fast build.
  27 +
  28 +1.st.arm.Makefile.patch
  29 + st编译脚本补丁,允许用户指定cc编译器。
27 30
28 links: 31 links:
29 ffmpeg: 32 ffmpeg:
@@ -181,7 +181,9 @@ else @@ -181,7 +181,9 @@ else
181 echo "build st-1.9t"; 181 echo "build st-1.9t";
182 ( 182 (
183 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 183 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
184 - unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && make linux-debug && 184 + unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 &&
  185 + patch -p1 < ../../3rdparty/1.st.arm.Makefile.patch &&
  186 + make linux-debug &&
185 cd .. && rm -f st && ln -sf st-1.9/obj st 187 cd .. && rm -f st && ln -sf st-1.9/obj st
186 ) 188 )
187 fi 189 fi
@@ -349,7 +351,8 @@ if [ $SRS_SSL = YES ]; then @@ -349,7 +351,8 @@ if [ $SRS_SSL = YES ]; then
349 ( 351 (
350 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 352 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
351 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 353 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
352 - ./config --prefix=`pwd`/_release -no-shared && make && make install && 354 + ./config --prefix=`pwd`/_release -no-shared &&
  355 + make && make install &&
353 cd .. && ln -sf openssl-1.0.1f/_release openssl 356 cd .. && ln -sf openssl-1.0.1f/_release openssl
354 ) 357 )
355 fi 358 fi
@@ -82,10 +82,12 @@ CppStd="-ansi" @@ -82,10 +82,12 @@ CppStd="-ansi"
82 CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug}" 82 CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug}"
83 #CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug} ${Performance}" 83 #CXXFLAGS="${CppStd} ${WarnLevel} ${GDBDebug} ${Performance}"
84 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} 84 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
85 -CXXFLAGS ?= ${CXXFLAGS} 85 +CC ?= gcc
  86 +GCC ?= gcc
86 CXX ?= g++ 87 CXX ?= g++
87 -LINK ?= \$(CXX)  
88 AR ?= ar 88 AR ?= ar
  89 +CXXFLAGS = ${CXXFLAGS}
  90 +LINK = g++
89 91
90 .PHONY: default srs bandwidth 92 .PHONY: default srs bandwidth
91 93