diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-16 18:40:44 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-16 18:40:44 +0000 |
| commit | 8eaba2804804dd2ab64fe5068337bbbbc922b838 (patch) | |
| tree | 080da886a4c319c2fb111aa2e78ddaca2ca8df88 /lib/Makefile | |
| parent | d64a9255590b1462b95f79aade2cd6193a7f06f7 (diff) | |
| download | FreeBSD-src-8eaba2804804dd2ab64fe5068337bbbbc922b838.zip FreeBSD-src-8eaba2804804dd2ab64fe5068337bbbbc922b838.tar.gz | |
MFC r257583, r258012, r258013:
r257583 (peter):
Remove the WITH_LIBICONV_COMPAT hack that seems to do more harm
than good. This caused libc to spoof the ports libiconv namespace
and provide a colliding libiconv.so.3 to fool rtld. This should
have been removed some time ago.
r258012:
Remove WITH_LIBICONV_COMPAT file to chase after r257583.
r258013:
Regenerate src.conf.5 after removal of WITH_LIBICONV_COMPAT.
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 5 |
1 files changed, 0 insertions, 5 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 |
