[PATCH 03/12] file2alias: fix uuid_t definitions for macos
Daniel Gomez
da.gomez at samsung.com
Wed Aug 7 21:31:59 UTC 2024
On Wed, Aug 07, 2024 at 05:30:40PM GMT, Nicolas Schier wrote:
> On Wed, Aug 07, 2024 at 01:09:17AM +0200, Daniel Gomez via B4 Relay wrote:
> > From: Daniel Gomez <da.gomez at samsung.com>
> >
> > The uuid_t struct defined in sys/types.h on macOS hosts conflicts with
> > the one defined in file2alias, resulting in the typedef redefinition
> > error below. To resolve this conflict, redefine the uuid_t specifically
> > for macOS hosts.
> >
> > Error:
> > HOSTCC scripts/mod/file2alias.o scripts/mod/file2alias.c:45:3:
> > error: typedef redefinition with different types ('struct uuid_t' vs
> > '__darwin_uuid_t' (aka 'unsigned char[16]')) 45 | } uuid_t; |
> > ^
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > sys/_types/_uuid_t.h:31:25: note: previous definition is here 31 |
> > typedef __darwin_uuid_t uuid_t; | ^
> > scripts/mod/file2alias.c:1354:7: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1354 |
> > uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1354:19: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1354 |
> > uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1354:31: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1354 |
> > uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1354:43: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1354 |
> > uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1354:55: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1354 |
> > uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1355:7: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1355 |
> > uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1355:19: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1355 |
> > uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1355:31: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1355 |
> > uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1355:43: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1355 |
> > uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1355:55: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1355 |
> > uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1356:7: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1356 |
> > uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1356:20: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1356 |
> > uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1356:33: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1356 |
> > uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1356:46: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1356 |
> > uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1356:59: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1356 |
> > uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
> > ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > scripts/mod/file2alias.c:1357:7: error: member reference base
> > type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
> > 'unsigned char[16]') is not a structure or union 1357 |
> > uuid->b[15]); | ~~~~^ ~
> > /Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
> > secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
> > __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
> > | ^~~~~~~~~~~
> > 17 errors generated.
> >
> > Signed-off-by: Daniel Gomez <da.gomez at samsung.com>
> > ---
> > scripts/mod/file2alias.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
> > index 99dce93a4188..ab743f6d60ef 100644
> > --- a/scripts/mod/file2alias.c
> > +++ b/scripts/mod/file2alias.c
> > @@ -11,6 +11,9 @@
> > */
> >
> > #include "modpost.h"
> > +#ifdef __APPLE__
> > +#define uuid_t sys_uuid_t
> > +#endif
> > #include "devicetable-offsets.h"
> >
> > /* We use the ELF typedefs for kernel_ulong_t but bite the bullet and
> >
>
> Have you tried to incorporate something like
>
> HOST_EXTRACFLAGS_file2alias.o += -D_UUID_T -D__GETHOSTUUID_H
Thank you for the suggestion. It worked after including the following line in
the Makefile:
HOSTCFLAGS_file2alias.o += -D_UUID_T -D__GETHOSTUUID_H
>
> for MacOS-based builds into scripts/mod/Makefile (cp. [1])?
>
> I think it would be nice to keep cross-os build dependencies in
> Makefiles as far as possible.
>
> Kind regards,
> Nicolas
>
>
> [1]: https://protect2.fireeye.com/v1/url?k=74c95bb1-15424ea8-74c8d0fe-74fe485cbfec-af6e3e40b0032f68&q=1&e=42c5b47d-7d52-4aa1-8a1e-9dbc36fa1953&u=https%3A%2F%2Fkloenk.eu%2Fposts%2Fbuild-linux-on-m1-macos%2F
More information about the dri-devel
mailing list