vlc | branch: master | Rafaël Carré <[email protected]> | Sun Aug 25 00:52:15 2013 +0200| [bf91c0515a9a1b5247aa865fde08f01b6b1e79af] | committer: Rafaël Carré
contrib: iconv: update patch after 7cc06ba8c9 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bf91c0515a9a1b5247aa865fde08f01b6b1e79af --- contrib/src/iconv/libiconv-android-ios.patch | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/contrib/src/iconv/libiconv-android-ios.patch b/contrib/src/iconv/libiconv-android-ios.patch index 9c33de1..5dafffb 100644 --- a/contrib/src/iconv/libiconv-android-ios.patch +++ b/contrib/src/iconv/libiconv-android-ios.patch @@ -1,23 +1,21 @@ ---- 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 +--- iconv/Makefile.in.orig 2013-08-25 00:49:42.477424777 +0200 ++++ iconv/Makefile.in 2013-08-25 00:50:28.117422857 +0200 +@@ -32,10 +32,6 @@ 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 +@@ -51,11 +47,8 @@ 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)' @@ -25,14 +23,12 @@ 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)' +@@ -64,8 +57,6 @@ 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 + cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
