From 09dbb05f78d856cf45cc97c9b111a7a0a551545d Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sat, 15 Nov 2014 19:30:39 +0100 Subject: [PATCH] mc: various makefile/compile time changes - add & reorder new compile time options with help text - all options are disabled by default, to reduce space req. - remove invalid mc configure options - fix broken makefile logic to enable/disable mc options Signed-off-by: Dirk Brenken --- utils/mc/Config.in | 52 ++++++++++++++++++++++++++++++++++++++++------ utils/mc/Makefile | 47 +++++++++++++++++++++++++++-------------- 2 files changed, 77 insertions(+), 22 deletions(-) diff --git a/utils/mc/Config.in b/utils/mc/Config.in index 7d6abf8ece..1445aa1a77 100644 --- a/utils/mc/Config.in +++ b/utils/mc/Config.in @@ -1,20 +1,60 @@ menu "Configuration" depends on PACKAGE_mc -config MC_DIFF_VIEWER - bool "Compile with diff viewer" +config MC_DIFFVIEWER + bool "Enable internal diff viewer" default n + help + This option enables the built-in diff viewer. + Disabled by default. config MC_EDITOR bool "Enable internal editor" default n + help + This option enables the built-in file editor. + Disabled by default. config MC_SUBSHELL - bool "Compile in concurrent subshell" + bool "Enable concurrent subshell" default n + help + This option enables concurrent subshell support. + Disabled by default. -config MC_DISABLE_VFS - bool "Disable VFS" - default y +config MC_LARGEFILE + bool "Enable largefile support" + default n + help + This option enables support for large files (> 2 GB). + Disabled by default. + +config MC_BACKGROUND + bool "Enable background operations" + default n + help + This option enables support for background operations which + allow to perform some tasks such as copying files in a + separate background process. Background code is known + to be less stable than the rest of the code. + Disabled by default. + +config MC_CHARSET + bool "Enable charset support" + default n + help + This option adds support for selecting character set of the text in + the internal viewer and editor and converting it on the fly. + The implementation is currently incomplete. + Disabled by default. + +config MC_VFS + bool "Enable virtual filesystem support" + default n + help + This option enables the Virtual File System switch code to get + transparent access to the following file systems: + cpio, tar, fish, sfs, ftp, sftp, extfs, smb. + Disabled by default. endmenu diff --git a/utils/mc/Makefile b/utils/mc/Makefile index 7d73e7c9f3..564d73ea29 100644 --- a/utils/mc/Makefile +++ b/utils/mc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mc PKG_VERSION:=4.8.13 -PKG_RELEASE:=1 +PKG_RELEASE:=1.1 PKG_MAINTAINER:=Dirk Brenken PKG_LICENSE:=GPL-3.0+ @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/nls.mk define Package/mc SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+glib2 +libncurses $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) + DEPENDS:=+glib2 +libncurses +MC_VFS:libssh2 $(LIBRPC_DEPENDS) $(ICONV_DEPENDS) TITLE:=Midnight Commander - a powerful visual file manager URL:=http://www.midnight-commander.org/ MENU:=1 @@ -37,47 +37,62 @@ define Package/mc/config endef define Package/mc/description - GNU Midnight Commander is a visual file manager, + GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. - It's a feature rich full-screen text mode application that allows you to copy, - move and delete files and whole directory trees, search for files - and run commands in the subshell. Internal viewer and editor are included. + It's a feature rich full-screen text mode application that allows you to copy, + move and delete files and whole directory trees, search for files + and run commands in the subshell. Internal viewer and editor are included. endef CONFIGURE_ARGS += \ - --enable-utf8 \ --disable-doxygen-doc \ - --disable-vfs-sftp \ --with-screen=ncurses \ --without-gpm-mouse \ --without-x \ - ac_cv_search_addwstr=no -ifeq ($(CONFIG_MC_DIFF_VIEWER),n) +CONFIGURE_VARS += \ + ac_cv_search_addwstr=no \ + +ifeq ($(CONFIG_MC_DIFFVIEWER),) CONFIGURE_ARGS += \ --without-diff-viewer endif -ifeq ($(CONFIG_MC_EDITOR),n) +ifeq ($(CONFIG_MC_EDITOR),) CONFIGURE_ARGS += \ - --without-edit + --without-internal-edit endif -ifeq ($(CONFIG_MC_SUBSHELL),n) +ifeq ($(CONFIG_MC_SUBSHELL),) CONFIGURE_ARGS += \ --without-subshell endif -ifeq ($(CONFIG_MC_DISABLE_VFS),y) +ifeq ($(CONFIG_MC_LARGEFILE),) CONFIGURE_ARGS += \ - --without-vfs + --disable-largefile +endif + +ifeq ($(CONFIG_MC_BACKGROUND),) +CONFIGURE_ARGS += \ + --disable-background +endif + +ifeq ($(CONFIG_MC_CHARSET),) +CONFIGURE_ARGS += \ + --disable-charset +endif + +ifeq ($(CONFIG_MC_VFS),) +CONFIGURE_ARGS += \ + --disable-vfs endif define Package/mc/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/mc -ifeq ($(CONFIG_MC_DIFF_VIEWER),y) +ifeq ($(CONFIG_MC_DIFFVIEWER),y) ln -sf mc $(1)/usr/bin/mcdiff endif ifeq ($(CONFIG_MC_EDITOR),y)