summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/busybox/busybox.mk1
-rw-r--r--package/vim/vim.mk5
2 files changed, 2 insertions, 4 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index e5de1b7284..c42c4a470a 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
# Packages that provide commands that may also be busybox applets:
BUSYBOX_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_VIM),vim) \
$(if $(BR2_PACKAGE_WGET),wget) \
$(if $(BR2_PACKAGE_WHOIS),whois)
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 0c02ead7b5..dbf71c573f 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -6,10 +6,7 @@
VIM_VERSION = v8.1.0133
VIM_SITE = $(call github,vim,vim,$(VIM_VERSION))
-# Win over busybox vi since vim is more feature-rich
-VIM_DEPENDENCIES = \
- ncurses $(TARGET_NLS_DEPENDENCIES) \
- $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
VIM_SUBDIR = src
VIM_CONF_ENV = \
vim_cv_toupper_broken=no \
OpenPOWER on IntegriCloud