diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 5 | ||||
| -rw-r--r-- | lib/libc/iconv/Symbol.map | 8 | ||||
| -rw-r--r-- | lib/libc/iconv/iconv.c | 12 | ||||
| -rw-r--r-- | lib/libiconv_compat/Makefile | 9 | ||||
| -rw-r--r-- | lib/libiconv_compat/stub.c | 8 |
5 files changed, 0 insertions, 42 deletions
diff --git a/lib/Makefile b/lib/Makefile index 9ac8945..074a917 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -81,7 +81,6 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ - ${_libiconv_compat} \ libipsec \ ${_libipx} \ libjail \ @@ -188,10 +187,6 @@ _libcxxrt= libcxxrt _libcplusplus= libc++ .endif -.if ${MK_LIBICONV_COMPAT} != "no" -_libiconv_compat= libiconv_compat -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif diff --git a/lib/libc/iconv/Symbol.map b/lib/libc/iconv/Symbol.map index 05df2ea..425aa3e 100644 --- a/lib/libc/iconv/Symbol.map +++ b/lib/libc/iconv/Symbol.map @@ -6,15 +6,7 @@ FBSD_1.2 { __iconv; __iconv_free_list; __iconv_get_list; - _libiconv_version; iconv_canonicalize; - libiconv; - libiconv_close; - libiconv_open; - libiconv_open_into; - libiconv_set_relocation_prefix; - libiconvctl; - libiconvlist; }; FBSD_1.3 { diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c index f388e8b..a4faf72 100644 --- a/lib/libc/iconv/iconv.c +++ b/lib/libc/iconv/iconv.c @@ -47,18 +47,6 @@ #include "citrus_hash.h" #include "citrus_iconv.h" -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -__weak_reference(iconv, libiconv); -__weak_reference(iconv_open, libiconv_open); -__weak_reference(iconv_open_into, libiconv_open_into); -__weak_reference(iconv_close, libiconv_close); -__weak_reference(iconvlist, libiconvlist); -__weak_reference(iconvctl, libiconvctl); -__weak_reference(iconv_set_relocation_prefix, libiconv_set_relocation_prefix); -__weak_reference(_iconv_version, _libiconv_version); -#endif - #define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) int _iconv_version = _ICONV_VERSION; diff --git a/lib/libiconv_compat/Makefile b/lib/libiconv_compat/Makefile deleted file mode 100644 index 3d4483a..0000000 --- a/lib/libiconv_compat/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -LIB= iconv -SHLIB_MAJOR= 3 -SRCS= stub.c - -WARNS?= 0 - -.include <bsd.lib.mk> diff --git a/lib/libiconv_compat/stub.c b/lib/libiconv_compat/stub.c deleted file mode 100644 index b4e56a2..0000000 --- a/lib/libiconv_compat/stub.c +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Hacks to support things like the dlopen() in libkiconv.so or - * ports that want to hard-code -liconv. - * - * $FreeBSD$ - */ - -int __libiconv_stub__; |
