Commit 9c5e102f authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

contribs: Add iconv

This is required by MLT
parent 8fca468f
b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 libiconv-1.14.tar.gz
--- iconv/Makefile.in 2015-10-10 08:51:48.738445600 +0200
+++ iconv/stripped.Makefile.in 2015-10-10 08:52:35.541832900 +0200
@@ -33,10 +33,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,52 +48,32 @@ 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)'
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)'
uninstall : force
cd libcharset && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
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)'
check : all force
cd libcharset && $(MAKE) check
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
mostlyclean : force
@@ -105,10 +81,6 @@ mostlyclean : force
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
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
rm -rf bin
@@ -117,10 +89,6 @@ clean : force
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
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
rm -rf bin
@@ -129,10 +97,6 @@ distclean : force
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
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
$(RM) config.status config.log config.cache Makefile libtool
$(RM) config.h stamp-h1 lib/stamp-h2
@@ -144,10 +108,6 @@ maintainer-clean : force
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
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
$(RM) config.status config.log config.cache Makefile libtool
$(RM) config.h stamp-h1 lib/stamp-h2
--- iconv/srclib/stdio.in.h.orig 2015-09-24 17:57:58.668232325 +0200
+++ iconv/srclib/stdio.in.h 2015-09-24 17:56:16.941881263 +0200
@@ -679,6 +679,8 @@
# endif
#endif
+#if !defined __USE_ISOC11 \
+ || (defined __cplusplus && __cplusplus <= 201103L)
#if @GNULIB_GETS@
# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -697,6 +699,7 @@
always declared, since it is required by C89. */
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
+#endif
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
This diff is collapsed.
# libiconv
LIBICONV_VERSION=1.14
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
PKGS += iconv
# iconv cannot be detect with pkg-config, but it is mandated by POSIX.
# Hard-code based on the operating system.
ifndef HAVE_WIN32
PKGS_FOUND += iconv
endif
$(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
$(call download_pkg,$(LIBICONV_URL),iconv)
.sum-iconv: libiconv-$(LIBICONV_VERSION).tar.gz
iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
$(UNPACK)
$(APPLY) $(SRC)/iconv/bins.patch
$(APPLY) $(SRC)/iconv/libiconv-c11.patch
ifdef HAVE_WIN64
$(APPLY) $(SRC)/iconv/libiconv-win64.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
cd $< && $(HOSTVARS) ./configure CFLAGS="$(CFLAGS) -fgnu89-inline" $(HOSTCONF) --disable-nls
cd $< && $(MAKE) install
touch $@
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