matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jan Engelhardt 2020-01-08 11:04:24 +01:00 committed by Stephen Hemminger
parent f4d7ce9bfa
commit 31f45088c9
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rt_names.h
View File

@ -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); const char *nl_proto_n2a(int id, char *buf, int len);
int nl_proto_a2n(__u32 *id, const char *arg); int nl_proto_a2n(__u32 *id, const char *arg);
extern int numeric;
#endif #endif

2
ip/ip.c
View File

@ -23,6 +23,7 @@
#include "ip_common.h" #include "ip_common.h"
#include "namespace.h" #include "namespace.h"
#include "color.h" #include "color.h"
#include "rt_names.h"
int preferred_family = AF_UNSPEC; int preferred_family = AF_UNSPEC;
int human_readable; int human_readable;
@ -36,7 +37,6 @@ int timestamp;
int force; int force;
int max_flush_loops = 10; int max_flush_loops = 10;
int batch_mode; int batch_mode;
int numeric;
bool do_all; bool do_all;
struct rtnl_handle rth = { .fd = -1 }; struct rtnl_handle rth = { .fd = -1 };

2
misc/ss.c
View File

@ -35,6 +35,7 @@
#include "libnetlink.h" #include "libnetlink.h"
#include "namespace.h" #include "namespace.h"
#include "SNAPSHOT.h" #include "SNAPSHOT.h"
#include "rt_names.h"
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/sock_diag.h> #include <linux/sock_diag.h>
@ -121,7 +122,6 @@ static int follow_events;
static int sctp_ino; static int sctp_ino;
static int show_tipcinfo; static int show_tipcinfo;
static int show_tos; static int show_tos;
int numeric;
int oneline; int oneline;
enum col_id { enum col_id {

2
tc/tc.c
View File

@ -29,6 +29,7 @@
#include "tc_util.h" #include "tc_util.h"
#include "tc_common.h" #include "tc_common.h"
#include "namespace.h" #include "namespace.h"
#include "rt_names.h"
int show_stats; int show_stats;
int show_details; int show_details;
@ -43,7 +44,6 @@ bool use_names;
int json; int json;
int color; int color;
int oneline; int oneline;
int numeric;
static char *conf_file; static char *conf_file;

2
tipc/tipc.c
View File

@ -22,10 +22,10 @@
#include "node.h" #include "node.h"
#include "peer.h" #include "peer.h"
#include "cmdl.h" #include "cmdl.h"
#include "utils.h"
int help_flag; int help_flag;
int json; int json;
int pretty;
static void about(struct cmdl *cmdl) static void about(struct cmdl *cmdl)
{ {