Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -4,7 +4,6 @@ config BR2_PACKAGE_VIM
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
VIM Text editor
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ VIM_VERSION = v8.0.0329
|
||||
VIM_SITE = $(call github,vim,vim,$(VIM_VERSION))
|
||||
# Win over busybox vi since vim is more feature-rich
|
||||
VIM_DEPENDENCIES = \
|
||||
ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
|
||||
ncurses $(TARGET_NLS_DEPENDENCIES) \
|
||||
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
|
||||
VIM_SUBDIR = src
|
||||
VIM_CONF_ENV = \
|
||||
@@ -65,9 +65,15 @@ define VIM_REMOVE_DOCS
|
||||
endef
|
||||
|
||||
# Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation
|
||||
ifeq ($(BR2_ROOTFS_MERGED_USR),y)
|
||||
define VIM_INSTALL_VI_SYMLINK
|
||||
ln -sf /usr/bin/vim $(TARGET_DIR)/bin/vi
|
||||
ln -sf vim $(TARGET_DIR)/usr/bin/vi
|
||||
endef
|
||||
else
|
||||
define VIM_INSTALL_VI_SYMLINK
|
||||
ln -sf ../usr/bin/vim $(TARGET_DIR)/bin/vi
|
||||
endef
|
||||
endif
|
||||
VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VI_SYMLINK
|
||||
|
||||
ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
|
||||
|
||||
Reference in New Issue
Block a user