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 /include/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 'include/Makefile')
| -rw-r--r-- | include/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/Makefile b/include/Makefile index 1f55f4e..44a54e3 100644 --- a/include/Makefile +++ b/include/Makefile @@ -83,15 +83,7 @@ _netipx= netipx # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" -CLEANFILES+= _libiconv_compat.h -INCS+= _libiconv_compat.h iconv.h -_libiconv_compat.h: ${.CURDIR}/Makefile - echo "/* Indicate whether libiconv symbols are present */" > _libiconv_compat.h -.if ${MK_LIBICONV_COMPAT} == "yes" - echo "#define __LIBICONV_COMPAT" >> _libiconv_compat.h -.else - echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h -.endif +INCS+= iconv.h .endif |
