Skip to contentSkip to conversation

nano: fix build breakage with libmagic

PATCH New Gustavo Zacarias 2 participants 3 messages Nov 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/nano/nano.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/nano/nano.mk +6 -0
index 3707e77..8a40f71 100644
@@ -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
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 nano: fix build breakage with libmagic

Dear Gustavo Zacarias,

package/nano/nano.mk NANO_CONF_OPT = --without-slang · line 19

Quoted 4 lines · Gustavo Zacarias
package/nano/nano.mk +4 -0
+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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 nano: fix build breakage with libmagic

Quoted 2 lines · Thomas Petazzoni

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!