diff options
author | Satadru Pramanik <satadru@umich.edu> | 2019-11-15 12:42:44 -0500 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2019-11-30 00:58:44 +0100 |
commit | cde70954effe137fac830730105853f929e9d28a (patch) | |
tree | 0f967620c58e7fcf05e9f0f584c81c9a9df33a0f | |
parent | a4d798e8dd61a65078d7bdfea3418cb699c47163 (diff) | |
download | upstream-cde70954effe137fac830730105853f929e9d28a.tar.gz upstream-cde70954effe137fac830730105853f929e9d28a.tar.bz2 upstream-cde70954effe137fac830730105853f929e9d28a.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>
(cherry picked from commit f1410902e6c089a53935ab44e83207e877445bc5)
-rw-r--r-- | package/utils/busybox/config/editors/Config.in | 3 |
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. |