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 /ObsoleteFiles.inc | |
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 'ObsoleteFiles.inc')
-rw-r--r-- | ObsoleteFiles.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f60c301..104b0a5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20131103: WITH_LIBICONV_COMPAT removal +OLD_FILES+=usr/include/_libiconv_compat.h +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 # 20131030: /etc/keys moved to /usr/share/keys OLD_DIRS+=etc/keys OLD_DIRS+=etc/keys/pkg |