diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2020-01-08 11:04:24 +0100 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2020-01-20 09:40:59 -0800 |
| commit | 31f45088c9c891542e38144d0a1bba124934693c (patch) | |
| tree | 9b3fb012ad157bddca10b28f321827182b139499 | |
| parent | f4d7ce9bfae9710fcb984f72d1119d8bf4ff2f8c (diff) | |
| download | iproute2-31f45088c9c891542e38144d0a1bba124934693c.tar.gz | |
build: fix build failure with -fno-common
$ make CCOPTS=-fno-common
gcc ... -o ip
ld: rt_names.o (symbol from plugin): in function "rtnl_rtprot_n2a":
(.text+0x0): multiple definition of "numeric"; ip.o (symbol from plugin):(.text+0x0): first defined here
gcc ... -o tipc
ld: ../lib/libutil.a(utils.o):(.bss+0xc): multiple definition of `pretty';
tipc.o:tipc.c:28: first defined here
References: https://bugzilla.opensuse.org/1160244
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | include/rt_names.h | 2 | ||||
| -rw-r--r-- | ip/ip.c | 2 | ||||
| -rw-r--r-- | misc/ss.c | 2 | ||||
| -rw-r--r-- | tc/tc.c | 2 | ||||
| -rw-r--r-- | tipc/tipc.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/include/rt_names.h b/include/rt_names.h index 62ebbd6a3..7afce1705 100644 --- a/include/rt_names.h +++ b/include/rt_names.h @@ -33,4 +33,6 @@ int ll_proto_a2n(unsigned short *id, const char *buf); const char *nl_proto_n2a(int id, char *buf, int len); int nl_proto_a2n(__u32 *id, const char *arg); +extern int numeric; + #endif @@ -23,6 +23,7 @@ #include "ip_common.h" #include "namespace.h" #include "color.h" +#include "rt_names.h" int preferred_family = AF_UNSPEC; int human_readable; @@ -36,7 +37,6 @@ int timestamp; int force; int max_flush_loops = 10; int batch_mode; -int numeric; bool do_all; struct rtnl_handle rth = { .fd = -1 }; @@ -35,6 +35,7 @@ #include "libnetlink.h" #include "namespace.h" #include "SNAPSHOT.h" +#include "rt_names.h" #include <linux/tcp.h> #include <linux/sock_diag.h> @@ -121,7 +122,6 @@ static int follow_events; static int sctp_ino; static int show_tipcinfo; static int show_tos; -int numeric; int oneline; enum col_id { @@ -29,6 +29,7 @@ #include "tc_util.h" #include "tc_common.h" #include "namespace.h" +#include "rt_names.h" int show_stats; int show_details; @@ -43,7 +44,6 @@ bool use_names; int json; int color; int oneline; -int numeric; static char *conf_file; diff --git a/tipc/tipc.c b/tipc/tipc.c index f85ddee0e..60176a044 100644 --- a/tipc/tipc.c +++ b/tipc/tipc.c @@ -22,10 +22,10 @@ #include "node.h" #include "peer.h" #include "cmdl.h" +#include "utils.h" int help_flag; int json; -int pretty; static void about(struct cmdl *cmdl) { |