Commit f9c2858d authored by Baruch Siach's avatar Baruch Siach Committed by Thomas Petazzoni
Browse files

ipmiutil: fix musl build issues 

Add patches fixing a number of build failures under musl.

The first patch fixes the following autobuild failures:
http://autobuild.buildroot.net/results/bc8/bc8f97f0739e5b842057fdf60eb9309c3e30fac1/
http://autobuild.buildroot.net/results/937/937163f988bb3680630544f6c0ed45b18bc83511/
http://autobuild.buildroot.net/results/862/862af4c6be4b78e65528195305653eedac4163c6/



and others.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 7cc5e6da

package/ipmiutil/0004-avoid-wchar-t-redefinition.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Avoid wchar_t redefinition



The musl C library does not define _WCHAR_T. Check also for compiler defined

__WCHAR_TYPE__.



Signed-off-by: Baruch Siach <baruch@tkos.co.il>



diff -Nuar ipmiutil-2.9.5-orig/util/imb_api.h ipmiutil-2.9.5/util/imb_api.h

--- ipmiutil-2.9.5-orig/util/imb_api.h	2014-11-04 19:46:11.000000000 +0200

+++ ipmiutil-2.9.5/util/imb_api.h	2015-09-29 07:49:40.799063825 +0300

@@ -49,7 +49,7 @@

 /* DOS defines wchar_t in stdlib.h */

 #else 

  // defined(LINUX) | defined(SOLARIS)

-#ifndef _WCHAR_T

+#if !defined(_WCHAR_T) && !defined(__WCHAR_TYPE__)

 #define _WCHAR_T

 typedef long    wchar_t;

 #endif

package/ipmiutil/0005-add-missing-param.h-header-include.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Add missing linux/param.h header include



Fixes the following build failure under musl:



mem_if.c: In function ‘MapPhysicalMemory’:

mem_if.c:337:36: error: ‘EXEC_PAGESIZE’ undeclared (first use in this function)

  ulDiff = (ULONG)(tdStartAddress % EXEC_PAGESIZE);

                                    ^



Signed-off-by: Baruch Siach <baruch@tkos.co.il>



diff -Nuar ipmiutil-2.9.5-orig/util/mem_if.c ipmiutil-2.9.5/util/mem_if.c

--- ipmiutil-2.9.5-orig/util/mem_if.c	2014-11-04 19:46:11.000000000 +0200

+++ ipmiutil-2.9.5/util/mem_if.c	2015-09-29 08:08:31.800459775 +0300

@@ -65,6 +65,9 @@

 #include <sys/param.h>

 #include <sys/mman.h>

 #include <sys/ioctl.h>

+#ifdef __linux__

+#include <linux/param.h>

+#endif

 #endif

 #if defined(SOLARIS) || defined(BSD)

 #define EXEC_PAGESIZE     4096

package/ipmiutil/0006-add-missing-sys-select.h-include.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Add missing sys/select.h include



POSIX.1-2001 requires sys/select.h for select(). Fixes the following build

failure under musl:



ipmimv.c: In function ‘ipmicmd_mv’:

ipmimv.c:345:5: error: unknown type name ‘fd_set’

     fd_set readfds;

     ^

ipmimv.c:346:20: error: storage size of ‘tv’ isn’t known

     struct timeval tv;

                    ^



Signed-off-by: Baruch Siach <baruch@tkos.co.il>



diff -Nuar ipmiutil-2.9.5-orig/util/ipmimv.c ipmiutil-2.9.5/util/ipmimv.c

--- ipmiutil-2.9.5-orig/util/ipmimv.c	2014-11-04 19:46:11.000000000 +0200

+++ ipmiutil-2.9.5/util/ipmimv.c	2015-09-29 09:16:08.862828679 +0300

@@ -62,6 +62,7 @@

 #include <time.h>

 #include <errno.h>

 #include <sys/ioctl.h>

+#include <sys/select.h>

 #if defined(MACOS)

 #include <sys/time.h>

 #else