From 5fe77cf9ed586a84c5ccd289154d0b543d2b4949 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 23 Apr 2014 08:38:29 -0500 Subject: As long as uClibc's still around and requires you to jump through hoops to get iconv(), probe and build defconfig without it if it's not there. --- scripts/genconfig.sh | 5 +++++ toys/pending/iconv.c | 1 + 2 files changed, 6 insertions(+) diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index 41f1a173..4425328d 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -34,6 +34,11 @@ EOF #error nope #endif EOF + + # Hard to come by in uClibc. + probesymbol TOYBOX_ICONV -c << EOF + #include "iconv.h" +EOF } genconfig() diff --git a/toys/pending/iconv.c b/toys/pending/iconv.c index 847fcfd1..f4c64fa3 100644 --- a/toys/pending/iconv.c +++ b/toys/pending/iconv.c @@ -9,6 +9,7 @@ USE_ICONV(NEWTOY(iconv, "t:f:", TOYFLAG_USR|TOYFLAG_BIN)) config ICONV bool "iconv" default y + depends on TOYBOX_ICONV help usage: iconv [-f FROM] [-t TO] [FILE...] -- cgit v1.2.3