| Message ID | 1384447812-2546-1-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Superseded |
| Headers | show |
Dear Gustavo Zacarias, On Thu, 14 Nov 2013 13:50:12 -0300, Gustavo Zacarias wrote: > +ifeq ($(BR2_PACKAGE_FILE),y) > + NANO_DEPENDENCIES += file > +else > + NANO_CONF_OPT += ac_cv_lib_magic_magic_open=no We usually pass these variables in <pkg>_CONF_ENV, no? Though I know it's legit to pass them as options to configure. Thomas
On 11/14/2013 01:52 PM, Thomas Petazzoni wrote: > We usually pass these variables in <pkg>_CONF_ENV, no? Though I know > it's legit to pass them as options to configure. Coffee, double please!
diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 3707e77..8a40f71 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_OPT += ac_cv_lib_magic_magic_open=no +endif + ifeq ($(BR2_PACKAGE_NANO_TINY),y) NANO_CONF_OPT += --enable-tiny endif
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> --- package/nano/nano.mk | 6 ++++++ 1 file changed, 6 insertions(+)