ldpd: Fix linking error on Fedora Rawhide with GCC 10

GCC 10 switched to -fno-common by default, see
https://gcc.gnu.org/gcc-10/porting_to.html#common for details.

Fixes:
  CCLD     ldpd/ldpd
/usr/bin/ld: ldpd/libldp.a(adjacency.o):/home/ruben/src/frr/ldpd/ldpe.h:294: multiple definition of `pkt_ptr'; ldpd/ldpd.o:/home/ruben/src/frr/ldpd/ldpe.h:294: first defined here

Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
(cherry picked from commit 56b7d7252f13f3c90c824287b2441f13e2b0defe)

diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index c16d92f28b9821365f82591086ecce616e0cd19b..3a964c0caa754574b3b00cfd7d60a8efd4b4321f 100644 (file)
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -97,6 +97,8 @@ static struct quagga_signal_t ldpe_signals[] =
        },
 };
 
+char *pkt_ptr; /* packet buffer */
+
 /* label distribution protocol engine */
 void
 ldpe(void)

diff --git a/ldpd/ldpe.h b/ldpd/ldpe.h
index ccff1e803d354f890e528b6e72c1245fca668561..5b40383db25fda896447b238206d350289bdbdd3 100644 (file)
--- a/ldpd/ldpe.h
+++ b/ldpd/ldpe.h
@@ -291,7 +291,7 @@ struct tcp_conn             *tcp_new(int, struct nbr *);
 void                    pending_conn_del(struct pending_conn *);
 struct pending_conn    *pending_conn_find(int, union ldpd_addr *);
 
-char   *pkt_ptr;       /* packet buffer */
+extern char *pkt_ptr; /* packet buffer */
 
 /* pfkey.c */
 #ifdef __OpenBSD__