mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-02-03 22:50:33 +00:00
Code Issues Projects Releases Wiki Activity

python3-netifaces: Fix build with python3 and musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-08-28 11:48:48 -07:00
parent 3dd74712ed
commit 6dd82f3a04
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta-python/recipes-devtools/python/python3-netifaces/0001-netifaces-initialize-msghdr-in-a-portable-way.patch Normal file
View File

@@ -0,0 +1,49 @@
From cbcd19f38ae4b31c57c57ce3619b8d2674defb68 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 28 Aug 2022 08:11:27 -0700
Subject: [PATCH] netifaces: initialize msghdr in a portable way
musl has padding bytes inside the msghdr struct which means initializing
full structure will cause wrong assignments, doing partial assignment is
more portable and assign the elements after that
Fixes
netifaces.c:1808:9: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion]
NULL,
^~~~
Upstream-Status: Inappropriate [Upstream Repo is read-only]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
netifaces.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/netifaces.c b/netifaces.c
index 839c42c..7da78e7 100644
--- a/netifaces.c
+++ b/netifaces.c
@@ -1800,15 +1800,12 @@ gateways (PyObject *self)
do {
struct sockaddr_nl sanl_from;
struct iovec iov = { msgbuf, bufsize };
- struct msghdr msghdr = {
- &sanl_from,
- sizeof(sanl_from),
- &iov,
- 1,
- NULL,
- 0,
- 0
- };
+ struct msghdr msghdr = { 0 };
+
+ msghdr.msg_name = &sanl_from;
+ msghdr.msg_namelen = sizeof(sanl_from);
+ msghdr.msg_iov = &iov;
+ msghdr.msg_iovlen = 1;
int nllen;
ret = recvmsg (s, &msghdr, 0);
--
2.37.2

6
meta-python/recipes-devtools/python/python3-netifaces_0.11.0.bb
View File

@@ -4,6 +4,8 @@ SECTION = "devel/python"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e138ba973c148df"
SRC_URI[sha256sum] = "043a79146eb2907edf439899f262b3dfe41717d34124298ed281139a8b93ca32"
inherit pypi setuptools3
SRC_URI += "file://0001-netifaces-initialize-msghdr-in-a-portable-way.patch"
SRC_URI[sha256sum] = "043a79146eb2907edf439899f262b3dfe41717d34124298ed281139a8b93ca32"