From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 30 Mar 2024 20:58:31 +0000 (+0100)
Subject: kernel: fix build issue on macOS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0cb3e86557fe17824283224b711fe7394590c680;p=openwrt%2Fstaging%2Fthess.git

kernel: fix build issue on macOS

On x86, the build failed while trying to compile tools/lib/string.c because
of a clash with the system provided implementation for strlcpy
Add ifdefs to prevent the conflict.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/target/linux/generic/hack-6.1/212-tools_portability.patch b/target/linux/generic/hack-6.1/212-tools_portability.patch
index add281991e..3ee4393006 100644
--- a/target/linux/generic/hack-6.1/212-tools_portability.patch
+++ b/target/linux/generic/hack-6.1/212-tools_portability.patch
@@ -340,3 +340,21 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  else ifneq ($(CROSS_COMPILE),)
  # Allow userspace to override CLANG_CROSS_FLAGS to specify their own
+--- a/tools/lib/string.c
++++ b/tools/lib/string.c
+@@ -100,6 +100,7 @@ int strtobool(const char *s, bool *res)
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wignored-attributes"
+ #endif
++#ifndef __APPLE__
+ size_t __weak strlcpy(char *dest, const char *src, size_t size)
+ {
+ 	size_t ret = strlen(src);
+@@ -111,6 +112,7 @@ size_t __weak strlcpy(char *dest, const
+ 	}
+ 	return ret;
+ }
++#endif
+ #ifdef __clang__
+ #pragma clang diagnostic pop
+ #endif