From 893108810b952777feca054a90c7ecfe7cad06e1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 14 Nov 2013 13:54:42 -0300 Subject: [PATCH] nano: fix build breakage with libmagic As reported by Cassiano Martin in bug #6692 if host == target the nano package can pick up the host libmagic and break. So add a check to see if the file package is enabled and use it, otherwise just disable libmagic support. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nano/nano.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 3707e7753d..4609f723cc 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -13,6 +13,12 @@ NANO_CONF_OPT = --without-slang NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false NANO_DEPENDENCIES = ncurses +ifeq ($(BR2_PACKAGE_FILE),y) + NANO_DEPENDENCIES += file +else + NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no +endif + ifeq ($(BR2_PACKAGE_NANO_TINY),y) NANO_CONF_OPT += --enable-tiny endif