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 /tools | |
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 'tools')
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 7 | ||||
-rw-r--r-- | tools/build/options/WITH_LIBICONV_COMPAT | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 81ad488..82d83733 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3190,13 +3190,6 @@ OLD_FILES+=usr/share/man/man1/host.1.gz # to be filled in #.endif -.if ${MK_LIBICONV_COMPAT} == no -OLD_FILES+=usr/lib/libiconv.a -OLD_FILES+=usr/lib/libiconv.so -OLD_FILES+=usr/lib/libiconv.so.3 -OLD_FILES+=usr/lib/libiconv_p.a -.endif - .if ${MK_LIBCPLUSPLUS} == no OLD_LIBS+=lib/libcxxrt.so.1 OLD_FILES+=usr/lib/libc++.a diff --git a/tools/build/options/WITH_LIBICONV_COMPAT b/tools/build/options/WITH_LIBICONV_COMPAT deleted file mode 100644 index f414798..0000000 --- a/tools/build/options/WITH_LIBICONV_COMPAT +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to build libiconv API and link time compatibility. |