From d593d540c9a028e35d89fe247c2d71d4ad6bfd30 Mon Sep 17 00:00:00 2001 From: Edward Wang Date: Thu, 26 Jul 2012 07:28:20 -0400 Subject: [PATCH] contrib: Allow live555 build on Android x86 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This package demands exceptions, but if it is enabled globally, it conflicts with other packages. Signed-off-by: Rafaël Carré --- contrib/src/live555/rules.mak | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak index 71d1ad65ae..b498c0b1f2 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -29,6 +29,8 @@ LIVE_TARGET := freebsd endif endif +LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions + live555: $(LIVE555_FILE) .sum-live555 rm -Rf live $(UNPACK) @@ -41,7 +43,7 @@ endif cd live && sed -i.orig \ -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' config.macosx cd live && sed -i.orig \ - -e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(EXTRA_CFLAGS)%" config.* + -e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_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-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux -- 2.11.4.GIT