mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 21:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/nano: fix tiny build

Browse Source 
Since upstream commit
https://git.savannah.gnu.org/cgit/nano.git/commit/configure.ac?id=235f92ce093099cd81f14827ab842bd331132790

--enable-color --enable-nanorc are needed for libmagic support in tiny
builds however as --enable-color needs fork() and tiny is selected when
!BR2_USE_MMU, it is easier to just disable libmagic with tiny builds

Add explicit options to enable tiny, libmagic, color, and nanorc, rather
than relying on defaults.

Fixes:
 - http://autobuild.buildroot.net/results/24894e62d6cf89d078959b12e67596c821d64696

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: add explicit options]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2021-01-19 18:53:26 +01:00 committed by Yann E. MORIN
parent 0c08aed801
commit 3c4fa30f7a
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
package/nano/nano.mk
View File

@ -19,18 +19,23 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false
NANO_MAKE_ENV += CURSES_LIB="-lncurses"
endif
ifeq ($(BR2_PACKAGE_FILE),y)
NANO_DEPENDENCIES += file
NANO_CONF_OPTS += --enable-libmagic
else
NANO_CONF_OPTS += --disable-libmagic
endif
ifeq ($(BR2_PACKAGE_NANO_TINY),y)
NANO_CONF_OPTS += --enable-tiny
NANO_CONF_OPTS += \
--enable-tiny \
--disable-libmagic \
--disable-color \
--disable-nanorc
define NANO_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano
endef
endif
else
NANO_CONF_OPTS += --disable-tiny
ifeq ($(BR2_PACKAGE_FILE),y)
NANO_DEPENDENCIES += file
NANO_CONF_OPTS += --enable-libmagic --enable-color --enable-nanorc
else
NANO_CONF_OPTS += --disable-libmagic --disable-libmagic --disable-color
endif # BR2_PACKAGE_FILE
endif # BR2_PACKAGE_NANO_TINY
$(eval $(autotools-package))