Mercurial > hg > aboriginal
changeset 1683:f13b8fae1206 draft
There's a proper probe in the next toybox release, but this is a catch-up release (so the 3.15 kernel isn't skipped) using the old version.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sat, 06 Sep 2014 11:44:20 -0500 |
parents | 64316ca2bc9b |
children | 7b4566efd8bd |
files | sources/patches/toybox-iconv.patch |
diffstat | 1 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/toybox-iconv.patch Sat Sep 06 11:44:20 2014 -0500 @@ -0,0 +1,23 @@ +uClibc's iconv.h is just broken, so switch iconv off for now. + +Did you know that uClibc has an include/iconv.h in the source that has +a line "#error Attempted to include iconv.h when uClibc was built without +locale support." And then in the top level Makefile it has +"Makefile.in:HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h" +so that file is deleted after being installed in the case that line would +trigger. So it implements things it then prevents from ever being used. + +The correct answer this this insanity is to switch to musl. Working on it... + +diff -ru toybox/toys/pending/iconv.c toybox.bak/toys/pending/iconv.c +--- toybox/toys/pending/iconv.c 2014-04-16 19:49:15.000000000 -0500 ++++ toybox.bak/toys/pending/iconv.c 2014-09-06 10:52:43.195279885 -0500 +@@ -8,7 +8,7 @@ + + config ICONV + bool "iconv" +- default y ++ default n + help + usage: iconv [-f FROM] [-t TO] [FILE...] +