diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-22 06:46:23 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-22 06:46:23 +0000 |
| commit | 1d53e24413647eaa55bfa4074295adfab4a329b8 (patch) | |
| tree | 7d19e083fda5133d7aef3744d6bbe38199abb00e /system/musl/uapi-iphdr.patch | |
| parent | 5fd1fe7aae01ff576bb05b695f9ff710a2e43462 (diff) | |
| download | packages-1d53e24413647eaa55bfa4074295adfab4a329b8.tar.gz packages-1d53e24413647eaa55bfa4074295adfab4a329b8.tar.bz2 packages-1d53e24413647eaa55bfa4074295adfab4a329b8.tar.xz packages-1d53e24413647eaa55bfa4074295adfab4a329b8.zip | |
system/{easy-kernel,musl}: fix struct iphdr UAPI thing
Diffstat (limited to 'system/musl/uapi-iphdr.patch')
| -rw-r--r-- | system/musl/uapi-iphdr.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/system/musl/uapi-iphdr.patch b/system/musl/uapi-iphdr.patch new file mode 100644 index 000000000..8483ca306 --- /dev/null +++ b/system/musl/uapi-iphdr.patch @@ -0,0 +1,30 @@ +From 7e690371dbc52b0f771bc7cdecdb757d5e1a4c11 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sun, 22 Dec 2019 00:04:28 -0600 +Subject: [PATCH] netinet/ip.h: Add UAPI definition guard for iphdr + +This ensures that the musl definition of 'struct iphdr' does not conflict +with the Linux kernel UAPI definition of it. + +Some software, i.e. net-tools, will not compile against 5.4 kernel headers +without this patch and the corresponding Linux kernel patch. +--- + include/netinet/ip.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/netinet/ip.h b/include/netinet/ip.h +index 8b6d7fef..0ae132a5 100644 +--- a/include/netinet/ip.h ++++ b/include/netinet/ip.h +@@ -190,6 +190,8 @@ struct ip_timestamp { + + #define IP_MSS 576 + ++#define __UAPI_DEF_IPHDR 0 ++ + #ifdef __cplusplus + } + #endif +-- +2.22.1 + |