* [Buildroot] [git commit] package/nano: fix tiny build
@ 2021-01-11 21:37 Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2021-01-11 21:37 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=a0202ffa4a1e89225d22433d162d1726e43cd629
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.
Fixes:
http://autobuild.buildroot.net/results/248/24894e62d6cf89d078959b12e67596c821d64696/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/nano/nano.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index bde287bb32..1fc499c347 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -29,6 +29,9 @@ endif
ifeq ($(BR2_PACKAGE_NANO_TINY),y)
NANO_CONF_OPTS += --enable-tiny
+ifeq ($(BR2_PACKAGE_FILE),y)
+NANO_CONF_OPTS += --enable-color --enable-nanorc
+endif
define NANO_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano
endef
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [git commit] package/nano: fix tiny build
@ 2021-01-24 21:29 Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2021-01-24 21:29 UTC (permalink / raw)
To: buildroot
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))
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-24 21:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 21:37 [Buildroot] [git commit] package/nano: fix tiny build Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2021-01-24 21:29 Yann E. MORIN
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.