Author: sbruno Date: Tue Aug 6 21:30:37 2013 New Revision: 254010 URL: http://svnweb.freebsd.org/changeset/base/254010
Log: Adjust make knobs to know that WITH_ICONV installs a /usr/bin/iconv Remove it if the knob isn't tweaked. Certain ports seem to think that if /usr/bin/iconv exists, then libc has built in libiconv things and will blow up pretty nicely when built. Reviewed by: gjb@ MFC after: 2 weeks Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Tue Aug 6 21:16:00 2013 (r254009) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Tue Aug 6 21:30:37 2013 (r254010) @@ -4347,3 +4347,7 @@ OLD_FILES+=usr/bin/svnserve OLD_FILES+=usr/bin/svnsync OLD_FILES+=usr/bin/svnversion .endif + +.if ${MK_ICONV} == no +OLD_FILES+=usr/bin/iconv +.endif _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"