[vlc-commits] contrib: Allow libebml build on Android x86

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Thu Jul 26 07:28:22 2012 -0400| [9cd6a20525e417e166fd82437fbf5a04216f5559] | committer: Rafaël Carré

contrib: Allow libebml build on Android x86

This package needs exceptions.

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 contrib/src/ebml/rules.mak |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 4df752d..3708b33 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -15,11 +15,15 @@ libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
 	$(APPLY) $(SRC)/ebml/no-ansi.patch
 	$(MOVE)
 
+# libebml requires exceptions
+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
+					CPPFLAGS=""
+
 .ebml: libebml
 ifdef HAVE_WIN32
 	cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no
 else
-	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
+	cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) $(EBML_EXTRA_FLAGS) staticlib
 endif
 	cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
 	$(RANLIB) "$(PREFIX)/lib/libebml.a"