From 3a2b54faffc15234e6e620dcd3b180c21434b8e6 Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 6 Aug 2020 22:19:33 +0200 Subject: [PATCH] linux4.14: aarch64-musl fix --- .../patches/wireless_h-fix-include.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 srcpkgs/linux4.14/patches/wireless_h-fix-include.patch diff --git a/srcpkgs/linux4.14/patches/wireless_h-fix-include.patch b/srcpkgs/linux4.14/patches/wireless_h-fix-include.patch new file mode 100644 index 0000000000..53121e23ca --- /dev/null +++ b/srcpkgs/linux4.14/patches/wireless_h-fix-include.patch @@ -0,0 +1,37 @@ +This also affects aarch64-musl systems at very least. + +From 1b9ae0c92925ac40489be526d67d0010d0724ce0 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Thu, 21 May 2020 22:14:22 +0200 +Subject: [PATCH] wireless: Use linux/stddef.h instead of stddef.h + +When compiling inside the kernel include linux/stddef.h instead of +stddef.h. When I compile this header file in backports for power PC I +run into a conflict with ptrdiff_t. I was unable to reproduce this in +mainline kernel. I still would like to fix this problem in the kernel. + +Fixes: 6989310f5d43 ("wireless: Use offsetof instead of custom macro.") +Signed-off-by: Hauke Mehrtens +Link: https://lore.kernel.org/r/20200521201422.16493-1-hauke@hauke-m.de +Signed-off-by: Johannes Berg +--- + include/uapi/linux/wireless.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/include/uapi/linux/wireless.h b/include/uapi/linux/wireless.h +index a2c006a364e0b..24f3371ad8262 100644 +--- a/include/uapi/linux/wireless.h ++++ b/include/uapi/linux/wireless.h +@@ -74,7 +74,11 @@ + #include /* for "struct sockaddr" et al */ + #include /* for IFNAMSIZ and co... */ + +-#include /* for offsetof */ ++#ifdef __KERNEL__ ++# include /* for offsetof */ ++#else ++# include /* for offsetof */ ++#endif + + /***************************** VERSION *****************************/ + /*