From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/nano: fix tiny build
Date: Tue, 19 Jan 2021 21:30:49 +0100 [thread overview]
Message-ID: <20210119203049.GZ2375@scaer> (raw)
In-Reply-To: <20210119175326.497192-2-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2021-01-19 18:53 +0100, Fabrice Fontaine spake thusly:
> Since upstream commit
> https://git.savannah.gnu.org/cgit/nano.git/commit/configure.ac?id=235f92ce093099cd81f14827ab842bd331132790
>
> --enable-color --enable-nanorc are needed for libmagic support in tiny
> builds however as --enable-color needs fork() and tiny is selected when
> !BR2_USE_MMU, it is easier to just disable libmagic with tiny builds
>
> Fixes:
> - http://autobuild.buildroot.net/results/24894e62d6cf89d078959b12e67596c821d64696
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/nano/nano.mk | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/package/nano/nano.mk b/package/nano/nano.mk
> index c688ff216c..af6e1d62de 100644
> --- a/package/nano/nano.mk
> +++ b/package/nano/nano.mk
> @@ -19,18 +19,16 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false
> NANO_MAKE_ENV += CURSES_LIB="-lncurses"
> endif
>
> -ifeq ($(BR2_PACKAGE_FILE),y)
> -NANO_DEPENDENCIES += file
> -NANO_CONF_OPTS += --enable-libmagic
> -else
> -NANO_CONF_OPTS += --disable-libmagic
> -endif
> -
> ifeq ($(BR2_PACKAGE_NANO_TINY),y)
> NANO_CONF_OPTS += --enable-tiny
Don't wee also need an explicit --disable-libmagice in this case?
> define NANO_INSTALL_TARGET_CMDS
> $(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano
> endef
> +else ifeq ($(BR2_PACKAGE_FILE),y)
> +NANO_DEPENDENCIES += file
> +NANO_CONF_OPTS += --enable-libmagic
And here, don't we need explicit --enable-color --enable-nanorc ?
Unless they are only needed for tiny?
Regards,
Yann E. MORIN.
> +else
> +NANO_CONF_OPTS += --disable-libmagic
> endif
>
> $(eval $(autotools-package))
> --
> 2.29.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2021-01-19 20:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 17:53 [Buildroot] [PATCH 1/2] Revert "package/nano: fix tiny build" Fabrice Fontaine
2021-01-19 17:53 ` [Buildroot] [PATCH 2/2] package/nano: fix tiny build Fabrice Fontaine
2021-01-19 20:30 ` Yann E. MORIN [this message]
2021-01-19 20:42 ` Fabrice Fontaine
2021-01-24 21:38 ` Yann E. MORIN
2021-01-24 21:31 ` [Buildroot] [PATCH 1/2] Revert "package/nano: fix tiny build" Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210119203049.GZ2375@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.