changeset 1266:a302299dbb98 draft

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.
author Rob Landley <rob@landley.net>
date Wed, 23 Apr 2014 08:38:29 -0500
parents 0ecfaa7022e8
children dd2fd057111f
files scripts/genconfig.sh toys/pending/iconv.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/genconfig.sh	Wed Apr 23 08:37:07 2014 -0500
+++ b/scripts/genconfig.sh	Wed Apr 23 08:38:29 2014 -0500
@@ -34,6 +34,11 @@
     #error nope
     #endif
 EOF
+
+  # Hard to come by in uClibc.
+  probesymbol TOYBOX_ICONV -c << EOF
+    #include "iconv.h"
+EOF
 }
 
 genconfig()
--- a/toys/pending/iconv.c	Wed Apr 23 08:37:07 2014 -0500
+++ b/toys/pending/iconv.c	Wed Apr 23 08:38:29 2014 -0500
@@ -9,6 +9,7 @@
 config ICONV
   bool "iconv"
   default y
+  depends on TOYBOX_ICONV
   help
     usage: iconv [-f FROM] [-t TO] [FILE...]