Skip to contentSkip to conversation

Revert "package/nano: fix tiny build"

PATCH New Fabrice Fontaine 2 participants 6 messages Jan 19, 2021 – Jan 24, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "package/nano: fix tiny build"

This reverts commit a0202ffa4a1e89225d22433d162d1726e43cd629 as it will raise a build failure to enable color without MMU.

Fixes:
- http://autobuild.buildroot.org/results/cd5583b493df6e30a033cc6bc29c637eb0e46f64

---
 package/nano/nano.mk | 3 ---
 1 file changed, 3 deletions(-)
package/nano/nano.mk +0 -3
index 097afadc31..c688ff216c 100644
@@ -28,9 +28,6 @@ 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
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/2 package/nano: fix tiny build

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

---
 package/nano/nano.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
package/nano/nano.mk +5 -7
index c688ff216c..af6e1d62de 100644
@@ -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
 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
+else
+NANO_CONF_OPTS += --disable-libmagic
 endif
 
 $(eval $(autotools-package))
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/2 package/nano: fix tiny build

Fabrice, All,

On 2021-01-19 18:53 +0100, Fabrice Fontaine spake thusly:

Quoted 22 lines

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

---
 package/nano/nano.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
package/nano/nano.mk +0 -0
index c688ff216c..af6e1d62de 100644
@@ -19,18 +19,16 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false
 NANO_MAKE_ENV += CURSES_LIB="-lncurses"
 endif

package/nano/nano.mk NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false · line 23

Quoted 10 lines
package/nano/nano.mk +0 -7
 
-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?

package/nano/nano.mk NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false · line 29

Quoted 6 lines
package/nano/nano.mk +3 -0
 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.

Quoted 12 lines
package/nano/nano.mk +2 -0
+else
+NANO_CONF_OPTS += --disable-libmagic
 endif
 
 $(eval $(autotools-package))
Signature · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 2/2 package/nano: fix tiny build

Le mar. 19 janv. 2021 ? 21:30, Yann E. MORIN <[email protected]> a ?crit :

Quoted 27 lines

Fabrice, All,

On 2021-01-19 18:53 +0100, Fabrice Fontaine spake thusly:

Quoted 23 lines

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

---
 package/nano/nano.mk | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
package/nano/nano.mk +0 -0
index c688ff216c..af6e1d62de 100644
@@ -19,18 +19,16 @@ NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false
 NANO_MAKE_ENV += CURSES_LIB="-lncurses"
 endif
 
Quoted 11 lines

package/nano/nano.mk NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false · line 23

Quoted 9 lines
package/nano/nano.mk +0 -7
-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?

libmagic is disabled by default when tiny is enabled, here is an extract of configure.ac:

AC_ARG_ENABLE(tiny,
AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size])) if test "x$enable_tiny" = xyes; then
AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as
small as possible.])
if test "x$enable_libmagic" != xyes; then
enable_libmagic=no
fi
fi

Quoted 11 lines

package/nano/nano.mk NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false · line 29

Quoted 7 lines
package/nano/nano.mk +3 -0
 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?

Yes, they're only needed for tiny, here is an extract of configure.ac:

AC_ARG_ENABLE(libmagic, AS_HELP_STRING([--disable-libmagic], [Disable detection of file types via libmagic]))
if test "x$enable_libmagic" = xyes; then
if test "x$enable_tiny" = xyes; then

    if test "x$enable_color" != xyes; then
      AC_MSG_ERROR([
        ***  --enable-libmagic needs --enable-color and

--enable-nanorc to work])
fi
fi
if test "x$enable_color" = xno; then

    AC_MSG_ERROR([
      ***  --enable-libmagic cannot work with --disable-color nor

--disable-nanorc])
fi
fi

Quoted 19 lines

Regards,
Yann E. MORIN.

Quoted 8 lines
package/nano/nano.mk +2 -1
+else
+NANO_CONF_OPTS += --disable-libmagic
 endif
 
 $(eval $(autotools-package))
--

2.29.2

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
.-----------------.--------------------.------------------.--------------------.

Quoted 5 lines
|  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.  |

'------------------------------^-------^------------------^--------------------'

Best Regards,

Fabrice

#4 lore raw

PATCH 2/2 package/nano: fix tiny build

Fabrice, All,

On 2021-01-19 21:42 +0100, Fabrice Fontaine spake thusly:

Quoted 7 lines

Le mar. 19 janv. 2021 ? 21:30, Yann E. MORIN <[email protected]> a ?crit :

Quoted 6 lines

On 2021-01-19 18:53 +0100, Fabrice Fontaine spake thusly:

Quoted 5 lines

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

[--SNIP--]

Quoted 3 lines
Quoted 1 line

Don't wee also need an explicit --disable-libmagice in this case?

libmagic is disabled by default when tiny is enabled, here is an extract of configure.ac:

[--SNIP--]

Quoted 3 lines
Quoted 2 lines

And here, don't we need explicit --enable-color --enable-nanorc ? Unless they are only needed for tiny?

Yes, they're only needed for tiny, here is an extract of configure.ac:

[--SNIP--]

So I eventually applied this, but I did add the explicit options, rather than relying on defaults.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH 1/2 Revert "package/nano: fix tiny build"

In reply to Fabrice Fontaine

Fabrice, All,

On 2021-01-19 18:53 +0100, Fabrice Fontaine spake thusly:

Quoted 7 lines

This reverts commit a0202ffa4a1e89225d22433d162d1726e43cd629 as it will raise a build failure to enable color without MMU.

Fixes:
- http://autobuild.buildroot.org/results/cd5583b493df6e30a033cc6bc29c637eb0e46f64

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 25 lines
---
 package/nano/nano.mk | 3 ---
 1 file changed, 3 deletions(-)
package/nano/nano.mk +0 -3
index 097afadc31..c688ff216c 100644
@@ -28,9 +28,6 @@ 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
Signature · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'