diff options
| author | Rob Landley <rob@landley.net> | 2014-04-23 08:38:29 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2014-04-23 08:38:29 -0500 |
| commit | 5fe77cf9ed586a84c5ccd289154d0b543d2b4949 (patch) | |
| tree | 6f7d748d6a48271e86f9f0e06bc63b9fd7f42d3a | |
| parent | 3297e87c2ab798696b0fb3d06904dccea076b77a (diff) | |
| download | toybox-5fe77cf9ed586a84c5ccd289154d0b543d2b4949.tar.gz | |
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.
| -rwxr-xr-x | scripts/genconfig.sh | 5 | ||||
| -rw-r--r-- | toys/pending/iconv.c | 1 |
2 files changed, 6 insertions, 0 deletions
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...] |