[vlc-commits] Contribs: fix libarchive buildsystem for Android

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jan 19 13:02:04 2017 +0100| [127bdfef694f50731e2da586bd6acedad4dbae24] | committer: Jean-Baptiste Kempf

Contribs: fix libarchive buildsystem for Android

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

 contrib/src/libarchive/android.patch | 11 +++++++++++
 contrib/src/libarchive/rules.mak     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/contrib/src/libarchive/android.patch b/contrib/src/libarchive/android.patch
new file mode 100644
index 0000000..7af6223
--- /dev/null
+++ b/contrib/src/libarchive/android.patch
@@ -0,0 +1,11 @@
+diff -ruN libarchive/Makefile.am libarchive.new/Makefile.am
+--- libarchive/Makefile.am	2016-10-24 04:20:30.000000000 +0200
++++ libarchive.new/Makefile.am	2017-01-19 12:58:42.433742303 +0100
+@@ -246,6 +246,7 @@
+ 
+ # -no-undefined marks that libarchive doesn't rely on symbols
+ # defined in the application.  This is mandatory for cygwin.
++libarchive_la_CPPFLAGS= -I$(top_srcdir)/contrib/android/include
+ libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION)
+ libarchive_la_LIBADD= $(LTLIBICONV)
+ 
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 0208513..85605fa 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -17,12 +17,14 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
 libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive
 	$(UNPACK)
 	$(APPLY) $(SRC)/libarchive/0001-Fix-build-failure-without-STATVFS.patch
+	$(APPLY) $(SRC)/libarchive/android.patch
 	$(call pkg_static,"build/pkgconfig/libarchive.pc.in")
 	$(MOVE)
 
 .libarchive: libarchive
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \
-		--disable-bsdcpio --disable-bsdtar --without-nettle \
+		--disable-bsdcpio --disable-bsdtar --disable-bsdcat \
+		--without-nettle \
 		--without-xml2 --without-lzmadec --without-iconv --without-expat
 	cd $< && $(MAKE) install
 	touch $@