Commit 9b53351c authored by Rafaël Carré's avatar Rafaël Carré

contrib: live: Fix 6fbfa484 for OSX

use standard back reference (\1 instead of \0, mach with parens)
use OSX-compatible command line ordering (filenames go at the end)
parent fe7d9447
...@@ -38,10 +38,10 @@ ifdef HAVE_WINCE ...@@ -38,10 +38,10 @@ ifdef HAVE_WINCE
endif endif
cd live && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -e 's%LIBRARY_LINK =.*ar%LIBRARY_LINK = $(AR)%' -i.orig config.$(LIVE_TARGET) cd live && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -e 's%LIBRARY_LINK =.*ar%LIBRARY_LINK = $(AR)%' -i.orig config.$(LIVE_TARGET)
cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx* cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
cd live && sed -i.orig config.macosx \ cd live && sed -i.orig \
-e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' config.macosx
cd live && sed -i.orig config.* \ cd live && sed -i.orig \
-e 's%^COMPILE_OPTS.*$$%\0 '"$(EXTRA_CFLAGS)%" -e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(EXTRA_CFLAGS)%" config.*
cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include%' -i.orig config.linux cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include%' -i.orig config.linux
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment