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/man | |
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/man')
-rw-r--r-- | share/man/man5/src.conf.5 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 335e8bb..9a433c2 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd November 6, 2013 +.Dd November 11, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -471,12 +471,6 @@ Set to not build HTML docs. .It Va WITHOUT_ICONV .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ICONV 254919 2013-08-26 17:15:56Z antoine Set to not build iconv as part of libc. -When set, it also enforces the following options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_LIBICONV_COMPAT -.El .It Va WITHOUT_INET .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_INET 221266 2011-04-30 17:58:28Z bz Set to not build programs and libraries related to IPv4 networking. @@ -633,9 +627,6 @@ runtime linker. .It Va WITHOUT_LIBCPLUSPLUS .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim Set to avoid building libcxxrt and libc++. -.It Va WITH_LIBICONV_COMPAT -.\" from FreeBSD: stable/10/tools/build/options/WITH_LIBICONV_COMPAT 254919 2013-08-26 17:15:56Z antoine -Set to build libiconv API and link time compatibility. .It Va WITHOUT_LIBPTHREAD .\" from FreeBSD: stable/10/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm Set to not build the |