From c1f4596e3650959c3239bfc9f392bb9d42520017 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 1 Apr 2017 14:57:17 -0700 Subject: tpm2.0-tss: fix musl build issue Signed-off-by: Armin Kuster --- .../tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch | 27 ++++++++++++++++++++++ recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 5 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch diff --git a/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch b/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch new file mode 100644 index 0000000..b1e0aaa --- /dev/null +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss/musl_header_fix.patch @@ -0,0 +1,27 @@ +Add missing header to avoid: + +../TPM2.0-TSS/tcti/tcti_socket.c: In function 'SocketReceiveTpmResponse': +| ../TPM2.0-TSS/tcti/tcti_socket.c:286:5: error: unknown type name 'fd_set' +| fd_set readFds; +| ^~~~~~ +| ../TPM2.0-TSS/tcti/tcti_socket.c:287:20: error: storage size of 'tv' isn't known +| struct timeval tv, *tvPtr; +| ^~ + +Upstream-Status: Submitted +tcti_socket: fix musl build issue do to missing header #393 + +Signed-off-by: Armin Kuster + +Index: TPM2.0-TSS/tcti/tcti_socket.c +=================================================================== +--- TPM2.0-TSS.orig/tcti/tcti_socket.c ++++ TPM2.0-TSS/tcti/tcti_socket.c +@@ -27,6 +27,7 @@ + + #include + #include // Needed for _wtoi ++#include + + #include "sapi/tpm20.h" + #include "sapi/marshal.h" diff --git a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb index 1e57342..6f9ce67 100644 --- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb +++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb @@ -7,9 +7,12 @@ SECTION = "tpm" DEPENDS = "autoconf-archive pkgconfig" SRCREV = "d1bd1fe175d233c7c5adbe1b9f3d256c41721001" + SRC_URI = " \ git://github.com/01org/TPM2.0-TSS.git;protocol=git;branch=master;name=TPM2.0-TSS;destsuffix=TPM2.0-TSS \ - file://ax_pthread.m4" + file://ax_pthread.m4 \ + file://musl_header_fix.patch \ +" inherit autotools pkgconfig systemd -- cgit v1.2.3-54-g00ecf