contrib: Allow libebml build on Android x86

[vlc] / contrib / src / ebml / rules.mak

diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index bd3b07ce23f5fe7d914db6d997e892f0b0319982..3708b33063dca3f71b44b50f7fad332fcd65f727 100644 (file)
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -12,13 +12,18 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
 libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
        $(UNPACK)
        $(APPLY) $(SRC)/ebml/ebml-pic.patch
+       $(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"