From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] package/nano: fix tiny build
Date: Sun, 24 Jan 2021 22:29:35 +0100 [thread overview]
Message-ID: <20210124211901.7C54B7FC23@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=3c4fa30f7abff344261f1faa3166577addb30b89
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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
Add explicit options to enable tiny, libmagic, color, and nanorc, rather
than relying on defaults.
Fixes:
- http://autobuild.buildroot.net/results/24894e62d6cf89d078959b12e67596c821d64696
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998 at free.fr: add explicit options]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/nano/nano.mk | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index c688ff216c..d47c749ef5 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -19,18 +19,23 @@ 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
+NANO_CONF_OPTS += \
+ --enable-tiny \
+ --disable-libmagic \
+ --disable-color \
+ --disable-nanorc
define NANO_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano
endef
-endif
+else
+NANO_CONF_OPTS += --disable-tiny
+ifeq ($(BR2_PACKAGE_FILE),y)
+NANO_DEPENDENCIES += file
+NANO_CONF_OPTS += --enable-libmagic --enable-color --enable-nanorc
+else
+NANO_CONF_OPTS += --disable-libmagic --disable-libmagic --disable-color
+endif # BR2_PACKAGE_FILE
+endif # BR2_PACKAGE_NANO_TINY
$(eval $(autotools-package))
next reply other threads:[~2021-01-24 21:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 21:29 Yann E. MORIN [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-11 21:37 [Buildroot] [git commit] package/nano: fix tiny build Thomas Petazzoni
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=20210124211901.7C54B7FC23@busybox.osuosl.org \
--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.