[vlc-commits] contrib: live555: don't replace cc 2 times for macosx

2012-01-24 Thread Rafaël Carré
vlc/vlc-1.2 | branch: master | Rafaël Carré  | Tue Jan 24 
12:01:32 2012 -0500| [23df98e7772af2f77ed76df1092057df7bfdbf37] | committer: 
Jean-Baptiste Kempf

contrib: live555: don't replace cc 2 times for macosx

we could end up with 'ggcc'
forgotten in a6e2d06608df593af6118be34cc2f416d0c6d354
(cherry picked from commit a9739cc0a5ffe72aed386d50b9a08c5cce75d481)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=23df98e7772af2f77ed76df1092057df7bfdbf37
---

 contrib/src/live555/rules.mak |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index be0c2b2..80bb137 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -36,7 +36,6 @@ endif
cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
cd live && sed \
-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
-   -e 's%cc%$(CC)%' \
-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \
-i.orig config.macosx
cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ 
-fPIC\ -DPIC%' -i.orig config.linux

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] contrib: live555: don't replace cc 2 times for macosx

2012-01-24 Thread Rafaël Carré
vlc | branch: master | Rafaël Carré  | Tue Jan 24 12:01:32 
2012 -0500| [a9739cc0a5ffe72aed386d50b9a08c5cce75d481] | committer: Rafaël Carré

contrib: live555: don't replace cc 2 times for macosx

we could end up with 'ggcc'
forgotten in a6e2d06608df593af6118be34cc2f416d0c6d354

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9739cc0a5ffe72aed386d50b9a08c5cce75d481
---

 contrib/src/live555/rules.mak |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index be0c2b2..80bb137 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -36,7 +36,6 @@ endif
cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
cd live && sed \
-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
-   -e 's%cc%$(CC)%' \
-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' \
-i.orig config.macosx
cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ 
-fPIC\ -DPIC%' -i.orig config.linux

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits