MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lms8: Fix build on musl

Browse Source 
Add two patches to make lms8 build with musl libc (both generic fixes,
not musl specific).

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
This commit is contained in:
Jussi Kukkonen 2017-01-24 11:06:32 +02:00 committed by California Sullivan
parent c92e40dcd3
commit b7ef51cf8e
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/recipes-bsp/amt/lms/0001-Include-sys-select.h-for-fd_set.patch Normal file
View File

@ -0,0 +1,28 @@
From 518a3a277c89a3d6b0a9d3ee552cfa33a1dbd5c6 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 23 Jan 2017 20:45:08 +0200
Subject: [PATCH 1/2] Include sys/select.h for fd_set()
This is needed at least on musl.
Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
src/mei/MEILinux.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mei/MEILinux.cpp b/src/mei/MEILinux.cpp
index 1e9d28f..631270e 100755
--- a/src/mei/MEILinux.cpp
+++ b/src/mei/MEILinux.cpp
@@ -37,6 +37,7 @@
#include <cerrno>
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <sys/select.h>
#include <unistd.h>
#include <stdint.h>
#include <aio.h>
--
2.1.4

31
common/recipes-bsp/amt/lms/0002-Use-proper-netinet-in.h-API.patch Normal file
View File

@ -0,0 +1,31 @@
From 0adc925ca9e005f93d77f373ccda2a6c6cc3ff2f Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 23 Jan 2017 20:46:50 +0200
Subject: [PATCH 2/2] Use proper netinet/in.h API
in6addr is only guaranteed to contain this member:
uint8_t s6_addr[16]
Use that instead of the glibc implementation detail __in6_u.
Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
src/tools/ATNetworkTool.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/ATNetworkTool.cpp b/src/tools/ATNetworkTool.cpp
index 66e27df..0789c79 100755
--- a/src/tools/ATNetworkTool.cpp
+++ b/src/tools/ATNetworkTool.cpp
@@ -207,7 +207,7 @@ int ATNetworkTool::GetSockPeerIP(int sock, ATAddressList & peerAddresses, int &e
if(sa->sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&addr)) //if(IN6_IS_ADDR_V4COMPAT(&addr))
{
struct in_addr demapped_addr;
- memcpy(&demapped_addr.s_addr, &addr.__in6_u.__u6_addr8[12], 4);
+ memcpy(&demapped_addr.s_addr, &addr.s6_addr[12], 4);
struct sockaddr_in sa_in;
sa_in.sin_family = AF_INET;
--
2.1.4

2
common/recipes-bsp/amt/lms8_8.0.0-7.bb
View File

@ -10,6 +10,8 @@ BPN="lms"
SRC_URI = "http://software.intel.com/sites/default/files/${BPN}-${PV}.tar.gz \
file://readlink-declaration.patch \
file://0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch \
file://0001-Include-sys-select.h-for-fd_set.patch \
file://0002-Use-proper-netinet-in.h-API.patch \
"
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'