Skip to contentSkip to conversation

quagga: fix BR2_PACKAGE_QUAGGA_TCP_ZEBRA

PATCH New Fabrice Fontaine 2 participants 5 messages Dec 1, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/2 quagga: fix BR2_PACKAGE_QUAGGA_TCP_ZEBRA

Since bump to version 0.99.21 and commit b20c77321fa87f880ead2f27ecf19fd7c4f436da, BR2_PACKAGE_QUAGGA_TCP_ZEBRA has been wrongly rename into BR2_PACKAGE_QUAGGA_TCP_ZERBRA

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/quagga/quagga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/quagga/quagga.mk +1 -1
index b2b4e2a1f7..8c2b80631b 100644
@@ -45,7 +45,7 @@ QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_PIMD),--enable-pimd,--disable-pimd
 QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga)
 QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd)
 QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce)
-QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),--enable-tcp-zebra,--disable-tcp-zebra)
 
 define QUAGGA_USERS
 	quagga -1 quagga -1 * - - - Quagga priv drop user
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 quagga: zebra needs dynamic library

zebra library defines optind and opterr which are already defined in libc

Fixes:
- http://autobuild.buildroot.org/results/32f93a73379d073abcaf8936ffbb8b5707583024

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/quagga/Config.in | 4 ++++
 1 file changed, 4 insertions(+)
package/quagga/Config.in +4 -0
index 98b9d3481e..6c51394db3 100644
@@ -11,9 +11,13 @@ if BR2_PACKAGE_QUAGGA
 
 config BR2_PACKAGE_QUAGGA_ZEBRA
 	bool "zebra daemon"
+	depends on !BR2_STATIC_LIBS
 	help
 	  Build zebra daemon.
 
+comment "zebra daemon needs dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
 	bool "Use TCP sockets between zebra and protocol daemons"
 	depends on BR2_PACKAGE_QUAGGA_ZEBRA
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 2/2 quagga: zebra needs dynamic library

Hello,
Le sam. 1 d?c. 2018 ? 21:46, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 11 lines

Hello,

Quoted 5 lines · Fabrice Fontaine

zebra library defines optind and opterr which are already defined in libc

Fixes:
- http://autobuild.buildroot.org/results/32f93a73379d073abcaf8936ffbb8b5707583024

Meh, can't we just rename those variables ?

Actually, they have just copy/pasted getopt.c from the libc. This code is enabled only on musl because musl does not defined __GLIBC__, I will find a way to disable it and send a new patch.

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

Applied
#4 lore raw

PATCH 1/2 quagga: fix BR2_PACKAGE_QUAGGA_TCP_ZEBRA

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

Since bump to version 0.99.21 and commit b20c77321fa87f880ead2f27ecf19fd7c4f436da, BR2_PACKAGE_QUAGGA_TCP_ZEBRA has been wrongly rename into BR2_PACKAGE_QUAGGA_TCP_ZERBRA

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/quagga/quagga.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com