vlc | branch: master | Thomas Guillem <[email protected]> | Tue Feb 16 15:20:11 2016 +0100| [a35f61f0f544a2223d319788fcdd1a7bbf58e878] | committer: Thomas Guillem
contrib: iconv: remove unused android-ios patch bins.patch is now enough. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a35f61f0f544a2223d319788fcdd1a7bbf58e878 --- contrib/src/iconv/libiconv-android-ios.patch | 34 -------------------------- contrib/src/iconv/rules.mak | 6 ----- 2 files changed, 40 deletions(-) diff --git a/contrib/src/iconv/libiconv-android-ios.patch b/contrib/src/iconv/libiconv-android-ios.patch deleted file mode 100644 index 5dafffb..0000000 --- a/contrib/src/iconv/libiconv-android-ios.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 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" -@@ -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)' - 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)' -@@ -64,8 +57,6 @@ - cd srclib && $(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)' diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak index 386cc00..b5f31dd 100644 --- a/contrib/src/iconv/rules.mak +++ b/contrib/src/iconv/rules.mak @@ -22,12 +22,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv ifdef HAVE_WIN64 $(APPLY) $(SRC)/iconv/libiconv-win64.patch endif -ifdef HAVE_ANDROID - $(APPLY) $(SRC)/iconv/libiconv-android-ios.patch -endif -ifdef HAVE_IOS - $(APPLY) $(SRC)/iconv/libiconv-android-ios.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) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
