[Buildroot] [PATCHv2] libedit: really needs wchar support
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Jul 31 17:14:59 UTC 2013
On 2013-07-31 14:12 -0300, Gustavo Zacarias spake thusly:
> wctype.h is always included, even in configure tests.
> Fixes:
> http://autobuild.buildroot.net/results/ed8/ed85b9d688ad8389895e3ecd7a6a18151efc328d/
>
> Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> ---
> package/libedit/Config.in | 4 ++++
> package/libedit/libedit.mk | 10 +++-------
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/package/libedit/Config.in b/package/libedit/Config.in
> index 4747a38..72b0cf1 100644
> --- a/package/libedit/Config.in
> +++ b/package/libedit/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_LIBEDIT
> bool "libedit"
> + depends on BR2_USE_WCHAR
> select BR2_PACKAGE_NCURSES
> help
> The editline library (from BSD) provides generic line editing
> @@ -12,3 +13,6 @@ config BR2_PACKAGE_LIBEDIT
> in Buildroot as it makes it much simpler than using the upstream
> sources which require pmake:
> http://www.thrysoee.dk/editline/
> +
> +comment "libedit requires a toolchain with WCHAR support"
> + depends on !BR2_USE_WCHAR
> diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
> index 6769fdc..0ff418a 100644
> --- a/package/libedit/libedit.mk
> +++ b/package/libedit/libedit.mk
> @@ -12,6 +12,9 @@ LIBEDIT_DEPENDENCIES = ncurses
> # We're patching configure.ac
> LIBEDIT_AUTORECONF = YES
>
> +# Doesn't really support !wchar, but support is disabled otherwise
> +LIBEDIT_CONF_OPT += --enable-widec
> +
> # Note: libbsd required for *vis functions, but works only with a toolchain
> # with __progname; otherwise, some features are disabled, as if libbsd was
> # missing entirely.
> @@ -19,11 +22,4 @@ ifeq ($(BR2_PACKAGE_LIBBSD),y)
> LIBEDIT_DEPENDENCIES += libbsd
> endif
>
> -# Wide-char support is not autodetected by configure, we have to help a bit.
> -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_WCHAR),y)
> -LIBEDIT_CONF_OPT += --enable-widec
> -else
> -LIBEDIT_CONF_OPT += --disable-widec
> -endif
> -
> $(eval $(autotools-package))
> --
> 1.8.1.5
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list