Commit db888911 authored by Grigori Goronzy's avatar Grigori Goronzy Committed by Jean-Baptiste Kempf

contrib: add iconv

Modified-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 24c98c50
8475b020769e66f56e476143b81da032e10b02b76b8b49468ce0d8c5658dca1a36940da5cde2fc7e82add2679fc9efe5cd2ea10ccd349682ff85a64d10101662 libiconv-1.13.1.tar.gz
This diff is collapsed.
diff -urNp libiconv.orig/configure libiconv/configure
--- libiconv.orig/configure 2009-06-30 22:51:53.000000000 +0200
+++ libiconv/configure 2009-11-12 04:41:02.000000000 +0100
@@ -20344,6 +20344,7 @@ rm -f conftest*
fi
+gl_cv_header_signal_h_SIGPIPE=yes
{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_signal_h_SIGPIPE" >&5
$as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
@@ -23459,7 +23460,6 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <signal.h>
/* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */
#include <sys/types.h>
diff -urNp libiconv.orig/signal.h libiconv/signal.h
--- libiconv.orig/signal.h 1970-01-01 01:00:00.000000000 +0100
+++ libiconv/signal.h 2009-11-12 04:39:24.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef _SIGNAL_H_
+#define _SIGNAL_H_
+
+#define SIGABRT 22 /* Abnormal termination (abort) */
+
+typedef void (*__p_sig_fn_t)(int);
+#define SIG_DFL ((__p_sig_fn_t) 0)
+#define SIG_IGN ((__p_sig_fn_t) 1)
+#define SIG_ERR ((__p_sig_fn_t) -1)
+
+#endif /* Not _SIGNAL_H_ */
diff -urNp libiconv.orig/src/iconv.c libiconv/src/iconv.c
--- libiconv.orig/src/iconv.c 2009-06-21 13:17:33.000000000 +0200
+++ libiconv/src/iconv.c 2009-11-11 05:35:58.000000000 +0100
@@ -26,7 +26,9 @@
#include <string.h>
#include <iconv.h>
#include <errno.h>
-#include <locale.h>
+#ifdef HAVE_SETLOCALE
+# include <locale.h>
+#endif
#include <fcntl.h>
/* Ensure that iconv_no_i18n does not depend on libintl. */
# libiconv
LIBICONV_VERSION=1.13.1
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
ifeq ($(call need_pkg,"iconv"),)
PKGS_FOUND += iconv
endif
$(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
$(call download,$(LIBICONV_URL))
.sum-iconv: libiconv-$(LIBICONV_VERSION).tar.gz
iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
$(UNPACK)
ifdef HAVE_WIN64
$(APPLY) $(SRC)/iconv/libiconv-win64.patch
endif
ifdef HAVE_WINCE
$(APPLY) $(SRC)/iconv/libiconv-wince.patch
$(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch
endif
$(MOVE)
.iconv: iconv
cd $< && $(HOSTVARS) ./configure $(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