7aa057f2f1
Drop upstream patch. Renumber the remaining patch. Add upstream patch fixing build with musl libc. Cc: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001
|
|
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
|
Date: Wed, 20 Feb 2019 15:41:51 +0100
|
|
Subject: [PATCH] ss: fix compilation under glibc < 2.18
|
|
|
|
Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for
|
|
AF_VSOCK. This define is only provided since glibc version 2.18, so
|
|
compilation fails when using older toolchains.
|
|
|
|
Provide the necessary definitions if needed.
|
|
|
|
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
misc/ss.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/misc/ss.c b/misc/ss.c
|
|
index 9e821faf..766fdc5f 100644
|
|
--- a/misc/ss.c
|
|
+++ b/misc/ss.c
|
|
@@ -51,6 +51,14 @@
|
|
#include <linux/tipc_netlink.h>
|
|
#include <linux/tipc_sockets_diag.h>
|
|
|
|
+/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */
|
|
+#ifndef PF_VSOCK
|
|
+#define PF_VSOCK 40
|
|
+#endif
|
|
+#ifndef AF_VSOCK
|
|
+#define AF_VSOCK PF_VSOCK
|
|
+#endif
|
|
+
|
|
#define MAGIC_SEQ 123456
|
|
#define BUF_CHUNK (1024 * 1024)
|
|
#define LEN_ALIGN(x) (((x) + 1) & ~1)
|
|
--
|
|
2.19.2
|
|
|