Mercurial > hg > aboriginal
changeset 1668:04b6f9a8c6af
Yank patch next toybox version won't need (and musl doesn't either).
author | Rob Landley <rob@landley.net> |
---|---|
date | Wed, 02 Jul 2014 21:18:19 -0500 |
parents | edffac13b5f2 |
children | b74df510d10d |
files | sources/patches/toybox-uClibc.patch |
diffstat | 1 files changed, 0 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/patches/toybox-uClibc.patch Wed Jul 02 21:17:39 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -Ugly workaround until I can switch to musl. - -diff -r 9e105bab92e5 scripts/genconfig.sh ---- a/scripts/genconfig.sh Wed Apr 16 08:54:19 2014 -0500 -+++ b/scripts/genconfig.sh Wed Apr 16 14:53:56 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() -diff -r 9e105bab92e5 toys/pending/iconv.c ---- a/toys/pending/iconv.c Wed Apr 16 08:54:19 2014 -0500 -+++ b/toys/pending/iconv.c Wed Apr 16 14:53:56 2014 -0500 -@@ -9,6 +9,7 @@ - config ICONV - bool "iconv" - default y -+ depends on TOYBOX_ICONV - help - usage: iconv [-f FROM] [-t TO] [FILE...] -