package/busybox: invert dependency with vim

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index e5de1b7284d52cb8b8dbbf93384cceb910725ec6..c42c4a470a882f0d29887c855dc82d6d9695b570 100644 (file)
--- 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 0c02ead7b5374a3dd38b9b180fab39cd83adc52f..dbf71c573f6c7188fc9fb06363c285068f0cd817 100644 (file)
--- 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 \