aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorSatadru Pramanik <satadru@umich.edu>2019-11-15 12:42:44 -0500
committerPetr Štetiar <ynezz@true.cz>2019-11-30 00:53:36 +0100
commitf1410902e6c089a53935ab44e83207e877445bc5 (patch)
treee2326f52fce42da3659f7328f334b1622e3f89ee /package
parent839bc1e15ed5c0e00a68c95798b47ae0e279e4e9 (diff)
downloadupstream-f1410902e6c089a53935ab44e83207e877445bc5.tar.gz
upstream-f1410902e6c089a53935ab44e83207e877445bc5.tar.bz2
upstream-f1410902e6c089a53935ab44e83207e877445bc5.zip
busybox: add glibc dependency for vi regex option
Build with musl libc fails with BUSYBOX_DEFAULT_FEATURE_VI_REGEX_SEARCH enabled. Enabling BusyBox's vi regex search option depends upon GNU regex. Musl libc does not support GNU regex[1]. So this patch adds explicit dependency on GNU libc and while at it remove the FIXME comment. 1. https://wiki.musl-libc.org/functional-differences-from-glibc.html Ref: https://dev.archive.openwrt.org/ticket/21741.html Ref: https://forum.openwrt.org/t/busybox-not-compiling/ Ref: https://github.com/openwrt/packages/issues/4453 Signed-off-by: Satadru Pramanik <satadru@umich.edu> [commit subject/description tweaks, From: fix, USE_GLIBC fix, removed comments] Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'package')
-rw-r--r--package/utils/busybox/config/editors/Config.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/utils/busybox/config/editors/Config.in b/package/utils/busybox/config/editors/Config.in
index c0fbef1939..16d08bc0f8 100644
--- a/package/utils/busybox/config/editors/Config.in
+++ b/package/utils/busybox/config/editors/Config.in
@@ -126,8 +126,9 @@ config BUSYBOX_CONFIG_FEATURE_VI_SEARCH
config BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH
bool "Enable regex in search and replace"
- default BUSYBOX_DEFAULT_FEATURE_VI_REGEX_SEARCH # Uses GNU regex, which may be unavailable. FIXME
+ default BUSYBOX_DEFAULT_FEATURE_VI_REGEX_SEARCH
depends on BUSYBOX_CONFIG_FEATURE_VI_SEARCH
+ depends on USE_GLIBC
help
Use extended regex search.