Skip to contentSkip to conversation

package/iwd: fix build with glibc < 2.24

PATCH New Fabrice Fontaine 2 participants 2 messages Apr 22, 2020 – Apr 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/iwd: fix build with glibc < 2.24

Fixes:
- http://autobuild.buildroot.org/results/63f983aa22ca5303a55bc55e004f05a94e5f7259

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Fix commit title and message: issue is due to glibc, not gcc

 ...ame-xchg.c-fix-build-with-glibc-2.24.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/iwd/0001-frame-xchg.c-fix-build-with-glibc-2.24.patch
package/iwd/0001-frame-xchg.c-fix-build-with-glibc-2.24.patch new file +46 -0
new file mode 100644
index 0000000000..cd0bae4835
@@ -0,0 +1,46 @@
+From 44cd3719eb94c8d5776b37c73993eea0617902f7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 11 Apr 2020 23:21:42 +0200
+Subject: [PATCH] frame-xchg.c: fix build with glibc < 2.24
+
+SOL_NETLINK is used since commit
+87a198111af1ea67053895f7435fb99e3cdd2159 resulting in the following
+build failure with glibc < 2.24:
+
+src/frame-xchg.c: In function 'frame_watch_group_io_read':
+src/frame-xchg.c:328:27: error: 'SOL_NETLINK' undeclared (first use in this function)
+   if (cmsg->cmsg_level != SOL_NETLINK)
+                           ^
+
+This failure is due to glibc that doesn't support SOL_NETLINK before
+version 2.24 and
+https://github.com/bminor/glibc/commit/f9b437d5efce93800b51ad2a437c8b1c9616bf80
+
+Fixes:
+ - http://autobuild.buildroot.org/results/3485088b84111c271bbcfaf025aa4103c6452072
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+https://lists.01.org/hyperkitty/list/iwd at lists.01.org/thread/ZRN25CA5I7PGUTFIRJLLXN7VHWGDAZDN]
+---
+ src/frame-xchg.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/frame-xchg.c b/src/frame-xchg.c
+index 50351615..4c950fd3 100644
+--- a/src/frame-xchg.c
++++ b/src/frame-xchg.c
+@@ -42,6 +42,10 @@
+ #include "src/netdev.h"
+ #include "src/frame-xchg.h"
+ 
++#ifndef SOL_NETLINK
++#define SOL_NETLINK 270
++#endif
++
+ struct watch_group {
+ 	/*
+ 	 * Group IDs, except 0, are per wdev for user's convenience.
+-- 
+2.25.1
+
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/1 package/iwd: fix build with glibc < 2.24

Quoted 7 lines · On Wed, 22 Apr 2020 10:16:28 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/63f983aa22ca5303a55bc55e004f05a94e5f7259

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Fix commit title and message: issue is due to glibc, not gcc

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com