[Buildroot] [git commit] package/iproute2: backport patch to fix compilation under glibc < 2.18

[Buildroot] [git commit] package/iproute2: backport patch to fix compilation under glibc < 2.18

[Thomas Petazzoni]

commit: https://git.buildroot.net/buildroot/commit/?id=a669c0f2f58e47bef4b7c2863cd1ee587befb662
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

When compiling iproute2 using a toolchain containing glibc 2.17 and
older, it fails due to a missing definition of AF_VSOCK.

Add a submitted and accepted upstream patch to fix this issue.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 .../0002-ss-fix-compilation-under-glibc-2.18.patch | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch b/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch
new file mode 100644
index 0000000000..b6934f5d17
--- /dev/null
+++ b/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch
@@ -0,0 +1,39 @@
+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
+

[Buildroot] [git commit] package/iproute2: backport patch to fix compilation under glibc < 2.18

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=a669c0f2f58e47bef4b7c2863cd1ee587befb662
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > When compiling iproute2 using a toolchain containing glibc 2.17 and
 > older, it fails due to a missing definition of AF_VSOCK.

We don't really support such old glibc versions since 2017.08. From
CHANGES:

2017.08-rc1, Released August 2nd, 2017

        Toolchain:

        - CodeSourcery toolchains for x86 and SuperH have been
          removed, they were using a too old glibc version
          (2.17). External toolchains with glibc 2.17 or earlier are
          no longer supported.


But OK, the patch is small and already accepted upstream.

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit] package/iproute2: backport patch to fix compilation under glibc < 2.18

[Thomas Petazzoni]

Hello Peter,

On Tue, 26 Feb 2019 00:08:32 +0100
Peter Korsgaard <peter@korsgaard.com> wrote:

> We don't really support such old glibc versions since 2017.08. From
> CHANGES:
> 
> 2017.08-rc1, Released August 2nd, 2017
> 
>         Toolchain:
> 
>         - CodeSourcery toolchains for x86 and SuperH have been
>           removed, they were using a too old glibc version
>           (2.17). External toolchains with glibc 2.17 or earlier are
>           no longer supported.
> 
> 
> But OK, the patch is small and already accepted upstream.

Yes, the patch was already upstream, which is what convinced me to
apply this.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [git commit] package/iproute2: backport patch to fix compilation under glibc < 2.18

[Thomas De Schampheleire]

El mar., 26 feb. 2019 a las 0:08, Peter Korsgaard
(<peter@korsgaard.com>) escribi?:
>
> >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
>
>  > commit: https://git.buildroot.net/buildroot/commit/?id=a669c0f2f58e47bef4b7c2863cd1ee587befb662
>  > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
>  > When compiling iproute2 using a toolchain containing glibc 2.17 and
>  > older, it fails due to a missing definition of AF_VSOCK.
>
> We don't really support such old glibc versions since 2017.08. From
> CHANGES:
>
> 2017.08-rc1, Released August 2nd, 2017
>
>         Toolchain:
>
>         - CodeSourcery toolchains for x86 and SuperH have been
>           removed, they were using a too old glibc version
>           (2.17). External toolchains with glibc 2.17 or earlier are
>           no longer supported.
>

Yes, I am annoyed by the fact that this Marvell toolchain is so old,
and plan to do something about it, but at the moment I just have to
deal with it :-(

Thanks,
Thomas