[vlc-commits] contrib: iconv: don't build binaries
Rafaël Carré
git at videolan.org
Tue Aug 20 14:04:06 CEST 2013
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Aug 20 14:03:51 2013 +0200| [7cc06ba8c948e6acf2de9ca57630d98e5eecab8e] | committer: Rafaël Carré
contrib: iconv: don't build binaries
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7cc06ba8c948e6acf2de9ca57630d98e5eecab8e
---
contrib/src/iconv/bins.patch | 82 ++++++++++++++++++++++++++++++++++++++++++
contrib/src/iconv/rules.mak | 1 +
2 files changed, 83 insertions(+)
diff --git a/contrib/src/iconv/bins.patch b/contrib/src/iconv/bins.patch
new file mode 100644
index 0000000..75e11a1
--- /dev/null
+++ b/contrib/src/iconv/bins.patch
@@ -0,0 +1,82 @@
+--- iconv/Makefile.in.orig 2013-08-20 14:01:59.451167175 +0200
++++ iconv/Makefile.in 2013-08-20 14:02:24.007166142 +0200
+@@ -33,7 +33,6 @@
+ 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
+@@ -53,7 +52,6 @@
+ 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)'
+@@ -64,7 +62,6 @@
+ 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)'
+@@ -75,7 +72,6 @@
+ cd lib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ cd preload && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ cd srclib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+- cd src && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
+ cd po && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+ cd man && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)'
+@@ -85,7 +81,6 @@
+ cd lib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ cd preload && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ cd srclib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+- cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
+ $(RM) $(DESTDIR)$(includedir)/iconv.h
+ cd po && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)'
+ cd man && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' datarootdir='$(datarootdir)' datadir='$(datadir)' mandir='$(mandir)'
+@@ -95,7 +90,6 @@
+ cd lib && $(MAKE) check
+ cd preload && $(MAKE) check
+ cd srclib && $(MAKE) check
+- cd src && $(MAKE) check
+ cd po && $(MAKE) check
+ cd man && $(MAKE) check
+ if test -d tests; then cd tests && $(MAKE) check; fi
+@@ -106,7 +100,6 @@
+ cd lib && $(MAKE) mostlyclean
+ cd preload && $(MAKE) mostlyclean
+ cd srclib && $(MAKE) mostlyclean
+- cd src && $(MAKE) mostlyclean
+ cd po && $(MAKE) mostlyclean
+ cd man && $(MAKE) mostlyclean
+ if test -d tests; then cd tests && $(MAKE) mostlyclean; fi
+@@ -118,7 +111,6 @@
+ cd lib && $(MAKE) clean
+ cd preload && $(MAKE) clean
+ cd srclib && $(MAKE) clean
+- cd src && $(MAKE) clean
+ cd po && $(MAKE) clean
+ cd man && $(MAKE) clean
+ if test -d tests; then cd tests && $(MAKE) clean; fi
+@@ -130,7 +122,6 @@
+ cd lib && if test -f Makefile; then $(MAKE) distclean; fi
+ cd preload && if test -f Makefile; then $(MAKE) distclean; fi
+ cd srclib && if test -f Makefile; then $(MAKE) distclean; fi
+- cd src && if test -f Makefile; then $(MAKE) distclean; fi
+ cd po && if test -f Makefile; then $(MAKE) distclean; fi
+ cd man && if test -f Makefile; then $(MAKE) distclean; fi
+ if test -d tests; then cd tests && if test -f Makefile; then $(MAKE) distclean; fi; fi
+@@ -145,7 +136,6 @@
+ cd lib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ cd preload && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ cd srclib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+- cd src && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ cd po && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ cd man && if test -f Makefile; then $(MAKE) maintainer-clean; fi
+ if test -d tests; then cd tests && if test -f Makefile; then $(MAKE) maintainer-clean; fi; fi
diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index 541dbe3..4b133f1 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -17,6 +17,7 @@ $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
$(UNPACK)
$(APPLY) $(SRC)/iconv/win32.patch
+ $(APPLY) $(SRC)/iconv/bins.patch
ifdef HAVE_WIN64
$(APPLY) $(SRC)/iconv/libiconv-win64.patch
endif
More information about the vlc-commits
mailing list