Skip to content

V
vlc-2-2
Commit bf91c051 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

contrib: iconv: update patch after 7cc06ba8

parent 9794ec1c
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
contrib/src/iconv/libiconv-android-ios.patch
View file @ bf91c051
--- libiconv/Makefile.in 2009-06-21 19:17:33.000000000 +0800 --- iconv/Makefile.in.orig 2013-08-25 00:49:42.477424777 +0200
+++ libiconv/Makefile.in 2011-10-13 22:51:46.000000000 +0800 +++ iconv/Makefile.in 2013-08-25 00:50:28.117422857 +0200
@@ -32,11 +32,6 @@ SHELL = /bin/sh @@ -32,10 +32,6 @@
all : lib/localcharset.h force all : lib/localcharset.h force
cd lib && $(MAKE) all cd lib && $(MAKE) all
cd preload && $(MAKE) all cd preload && $(MAKE) all
- cd srclib && $(MAKE) all - cd srclib && $(MAKE) all
- cd src && $(MAKE) all
- cd po && $(MAKE) all - cd po && $(MAKE) all
- cd man && $(MAKE) all - cd man && $(MAKE) all
- if test -d tests; then cd tests && $(MAKE) all; fi - if test -d tests; then cd tests && $(MAKE) all; fi
lib/localcharset.h : lib/localcharset.h :
builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" 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 libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
cd lib && $(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 preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
- cd srclib && $(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 if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h $(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 po && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
...@@ -25,10 +23,8 @@ ...@@ -25,10 +23,8 @@
install-strip : lib/localcharset.h force install-strip : lib/localcharset.h force
cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' 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)' @@ -64,8 +57,6 @@
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 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 if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
$(INSTALL_DATA) include/iconv.h.inst $(DESTDIR)$(includedir)/iconv.h $(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 po && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment