summaryrefslogtreecommitdiff
path: root/package/libiconv
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-02 12:03:09 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-02 12:03:09 +0100
commitfbe47cba997e4f2f2dbaa6af0583dbec2e5d130c (patch)
tree63aa5fb4d8c8ad7e63aeaad50e5701a2918dbedd /package/libiconv
parent216fc3f63dcf07f5bc644165ce1965d733330de0 (diff)
remove dependencies to libiconv,pkg-config and file. use pkgconf and libiconv-tiny instead. fixes glib compile on systems without libiconv/ native iconv implementation
Diffstat (limited to 'package/libiconv')
-rw-r--r--package/libiconv/Makefile29
-rw-r--r--package/libiconv/patches/patch-srclib_stdio_in_h29
2 files changed, 0 insertions, 58 deletions
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
deleted file mode 100644
index 62cbeb0ee..000000000
--- a/package/libiconv/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:= libiconv
-PKG_VERSION:= 1.14
-PKG_RELEASE:= 1
-PKG_MD5SUM:= e34509b1623cec449dfeb73d7ce9c6c6
-PKG_DESCR:= character set conversion library
-PKG_SECTION:= libs
-PKG_URL:= http://www.gnu.org/software/libiconv/
-PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/}
-PKG_OPTS:= dev
-
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+= libonly
-endif
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-libiconv-install:
- ${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/
- ${CP} ${WRKINST}/usr/lib/libcharset.so* ${IDIR_LIBICONV}/usr/lib/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libiconv/patches/patch-srclib_stdio_in_h b/package/libiconv/patches/patch-srclib_stdio_in_h
deleted file mode 100644
index 72c920ad3..000000000
--- a/package/libiconv/patches/patch-srclib_stdio_in_h
+++ /dev/null
@@ -1,29 +0,0 @@
---- libiconv-1.14.orig/srclib/stdio.in.h 2011-08-07 15:42:06.000000000 +0200
-+++ libiconv-1.14/srclib/stdio.in.h 2013-10-24 16:56:53.000000000 +0200
-@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is un
- # endif
- #endif
-
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--# undef gets
--# define gets rpl_gets
--# endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--# undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
-+ so any use of gets warrants an unconditional warning; besides, C11
-+ removed it. */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-