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 /share/mk | |
| 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 'share/mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 9784553..e2f9894 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -368,7 +368,6 @@ __DEFAULT_NO_OPTIONS = \ DEBUG_FILES \ GPL_DTC \ HESIOD \ - LIBICONV_COMPAT \ INSTALL_AS_USER \ LLDB \ NAND \ @@ -491,10 +490,6 @@ MK_${var}:= no MK_LIBTHR:= no .endif -.if ${MK_ICONV} == "no" -MK_LIBICONV_COMPAT:= no -.endif - .if ${MK_LDNS} == "no" MK_LDNS_UTILS:= no MK_UNBOUND:= no |
