Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] nano: fix build breakage with libmagic
@ 2013-11-14 16:50 Gustavo Zacarias
  2013-11-14 16:52 ` Thomas Petazzoni
  0 siblings, 1 reply; 3+ messages in thread
From: Gustavo Zacarias @ 2013-11-14 16:50 UTC (permalink / raw)
  To: buildroot

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(+)

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
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] nano: fix build breakage with libmagic
  2013-11-14 16:50 [Buildroot] [PATCH] nano: fix build breakage with libmagic Gustavo Zacarias
@ 2013-11-14 16:52 ` Thomas Petazzoni
  2013-11-14 16:54   ` Gustavo Zacarias
  0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2013-11-14 16:52 UTC (permalink / raw)
  To: buildroot

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] nano: fix build breakage with libmagic
  2013-11-14 16:52 ` Thomas Petazzoni
@ 2013-11-14 16:54   ` Gustavo Zacarias
  0 siblings, 0 replies; 3+ messages in thread
From: Gustavo Zacarias @ 2013-11-14 16:54 UTC (permalink / raw)
  To: buildroot

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!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-11-14 16:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-14 16:50 [Buildroot] [PATCH] nano: fix build breakage with libmagic Gustavo Zacarias
2013-11-14 16:52 ` Thomas Petazzoni
2013-11-14 16:54   ` Gustavo Zacarias

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox