From 8eaba2804804dd2ab64fe5068337bbbbc922b838 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Sat, 16 Nov 2013 18:40:44 +0000
Subject: 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
---
 share/mk/bsd.own.mk | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'share/mk')

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
-- 
cgit v1.1