From 98c9002b41823b211b60504314e6071e5d67d146 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 12 Mar 2014 16:01:50 +0800 Subject: [PATCH] remove the patch for st for arm --- trunk/3rdparty/1.st.arm.Makefile.patch | 21 --------------------- trunk/auto/depends.sh | 1 - 2 files changed, 22 deletions(-) delete mode 100644 trunk/3rdparty/1.st.arm.Makefile.patch diff --git a/trunk/3rdparty/1.st.arm.Makefile.patch b/trunk/3rdparty/1.st.arm.Makefile.patch deleted file mode 100644 index 38c8f8192..000000000 --- a/trunk/3rdparty/1.st.arm.Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index b680ca369..ddff1073a 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -185,7 +185,6 @@ else ( rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 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 )