vlc | branch: master | Ming Hu <[email protected]> | Thu May 24 22:12:45 2012 +0200| [45a036e35eb68e6ae11154d67ae3670efa3155bc] | committer: Rafaël Carré
fix iconv on android Skip src (we don't need applications) and srclib (buggy replacement functions) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=45a036e35eb68e6ae11154d67ae3670efa3155bc --- contrib/src/iconv/libiconv-android.patch | 38 ++++++++++++++++++++++++++++++ contrib/src/iconv/rules.mak | 5 ++++ 2 files changed, 43 insertions(+) diff --git a/contrib/src/iconv/libiconv-android.patch b/contrib/src/iconv/libiconv-android.patch new file mode 100644 index 0000000..9c33de1 --- /dev/null +++ b/contrib/src/iconv/libiconv-android.patch @@ -0,0 +1,38 @@ +--- libiconv/Makefile.in 2009-06-21 19:17:33.000000000 +0800 ++++ libiconv/Makefile.in 2011-10-13 22:51:46.000000000 +0800 +@@ -32,11 +32,6 @@ SHELL = /bin/sh + all : lib/localcharset.h force + cd lib && $(MAKE) all + cd preload && $(MAKE) all +- cd srclib && $(MAKE) all +- cd src && $(MAKE) all +- cd po && $(MAKE) all +- cd man && $(MAKE) all +- if test -d tests; then cd tests && $(MAKE) all; fi + + lib/localcharset.h : + builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" +@@ -52,23 +47,16 @@ install : lib/localcharset.h force + cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' +- cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' +- cd src && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi + $(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h +- cd po && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' +- cd man && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)' + + install-strip : lib/localcharset.h force + cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd lib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd preload && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd srclib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' +- cd src && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi + $(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h +- cd po && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' +- cd man && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)' + + installdirs : force + cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' \ No newline at end of file diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak index 5c6e2b9..ed615b7 100644 --- a/contrib/src/iconv/rules.mak +++ b/contrib/src/iconv/rules.mak @@ -23,6 +23,11 @@ ifdef HAVE_WINCE $(APPLY) $(SRC)/iconv/libiconv-wince.patch $(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch endif +ifdef HAVE_ANDROID + $(APPLY) $(SRC)/iconv/libiconv-android.patch +endif + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux + $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub libcharset/build-aux $(MOVE) .iconv: iconv _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
