Re: [PATCH v2] lib: fix multiple strlcpy definition
From: Stephen Hemminger <stephen@networkplumber.org>
Date: 2017-09-29 18:59:06
On Thu, 28 Sep 2017 21:02:11 +0300 Baruch Siach [off-list ref] wrote:
Some C libraries, like uClibc and musl, provide BSD compatible strlcpy(). Add check_strlcpy() to configure, and avoid defining strlcpy and strlcat when the C library provides them. This fixes the following static link error with uClibc-ng: .../sysroot/usr/lib/libc.a(strlcpy.os): In function `strlcpy': strlcpy.c:(.text+0x0): multiple definition of `strlcpy' ../lib/libutil.a(utils.o):utils.c:(.text+0x1ddc): first defined here collect2: error: ld returned 1 exit status Acked-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
This is OK because it doesn't impact normal glibc too much.
quoted hunk ↗ jump to hunk
diff --git a/lib/Makefile b/lib/Makefile index 0fbdf4c31f50..132ad00c3335 100644 --- a/lib/Makefile +++ b/lib/Makefile@@ -1,5 +1,9 @@ include ../config.mk +ifeq ($(NEED_STRLCPY),y) + CFLAGS += -DNEED_STRLCPY +endif +
I just removed all the conditional CFLAGS out of subdirectory Makefiles and moved them into the generated config.mk. Please do that for this as well and resubmit.