[vlc-commits] contrib: Don't hardcode Android ABI tag in live555 build script
Edward Wang
git at videolan.org
Thu Jul 26 12:36:39 CEST 2012
vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Jul 25 20:31:22 2012 -0400| [2c26061ca8bd84ace8b8904f902157975ebd5229] | committer: Rafaël Carré
contrib: Don't hardcode Android ABI tag in live555 build script
Signed-off-by: Rafaël Carré <funman at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c26061ca8bd84ace8b8904f902157975ebd5229
---
contrib/src/live555/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 280816c..71d1ad6 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -44,7 +44,7 @@ endif
-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
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-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
patch -p0 < $(SRC)/live555/android.patch
endif
mv live $@
More information about the vlc-commits
mailing list