diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2013-11-14 13:54:42 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-11-14 20:46:26 +0100 |
| commit | 893108810b952777feca054a90c7ecfe7cad06e1 (patch) | |
| tree | 2f27b586628ae80b015249b5dfa801b59c7df1ca /package/nano | |
| parent | 2b9bdcafa3d69bcc3d63d5d1d3d2ab692413b39d (diff) | |
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 <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nano')
| -rw-r--r-- | package/nano/nano.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 3707e7753..4609f723c 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 |