Просмотр исходного кода

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 <[email protected]>
Felix Fietkau 1 год назад
Родитель
Сommit
0cb3e86557
1 измененных файлов с 18 добавлено и 0 удалено
  1. 18 0
      target/linux/generic/hack-6.1/212-tools_portability.patch

+ 18 - 0
target/linux/generic/hack-6.1/212-tools_portability.patch

@@ -340,3 +340,21 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  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