From: Daniel Gomez via B4 Relay <devnull+da.gomez.samsung.com@kernel.org>
To: "Masahiro Yamada" <masahiroy@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Nicolas Schier" <nicolas@fjasle.eu>,
"Lucas De Marchi" <lucas.demarchi@intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"William Hubbs" <w.d.hubbs@gmail.com>,
"Chris Brannon" <chris@the-brannons.com>,
"Kirk Reiser" <kirk@reisers.ca>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
"Paul Moore" <paul@paul-moore.com>,
"Stephen Smalley" <stephen.smalley.work@gmail.com>,
"Ondrej Mosnacek" <omosnace@redhat.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>, "Marc Zyngier" <maz@kernel.org>,
"Oliver Upton" <oliver.upton@linux.dev>,
"James Morse" <james.morse@arm.com>,
"Suzuki K Poulose" <suzuki.poulose@arm.com>,
"Zenghui Yu" <yuzenghui@huawei.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jiri Slaby" <jirislaby@kernel.org>,
"Nick Desaulniers" <ndesaulniers@google.com>,
"Bill Wendling" <morbo@google.com>,
"Justin Stitt" <justinstitt@google.com>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
speakup@linux-speakup.org, selinux@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
linux-serial@vger.kernel.org, llvm@lists.linux.dev,
Finn Behrens <me@kloenk.dev>,
"Daniel Gomez (Samsung)" <d+samsung@kruces.com>,
gost.dev@samsung.com, Daniel Gomez <da.gomez@samsung.com>
Subject: [PATCH 03/12] file2alias: fix uuid_t definitions for macos
Date: Wed, 07 Aug 2024 01:09:17 +0200 [thread overview]
Message-ID: <20240807-macos-build-support-v1-3-4cd1ded85694@samsung.com> (raw)
In-Reply-To: <20240807-macos-build-support-v1-0-4cd1ded85694@samsung.com>
From: Daniel Gomez <da.gomez@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@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
--
Git-146)
next prev parent reply other threads:[~2024-08-06 23:10 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-06 23:09 [PATCH 00/12] Enable build system on macOS hosts Daniel Gomez via B4 Relay
2024-08-06 23:09 ` [PATCH 01/12] scripts: subarch.include: fix SUBARCH on MacOS hosts Daniel Gomez via B4 Relay
2024-08-07 15:07 ` Nicolas Schier
2024-08-23 16:12 ` Masahiro Yamada
2024-08-23 22:14 ` Daniel Gomez (Samsung)
2024-08-24 19:34 ` Daniel Gomez (Samsung)
2024-08-06 23:09 ` [PATCH 02/12] kbuild: add header_install dependency to scripts Daniel Gomez via B4 Relay
2024-08-07 15:23 ` Nicolas Schier
2024-08-06 23:09 ` Daniel Gomez via B4 Relay [this message]
2024-08-07 15:30 ` [PATCH 03/12] file2alias: fix uuid_t definitions for macos Nicolas Schier
2024-08-07 21:31 ` Daniel Gomez
2024-08-06 23:09 ` [PATCH 04/12] drm/xe: xe_gen_wa_oob: fix program_invocation_short_name " Daniel Gomez via B4 Relay
2024-08-07 1:50 ` Lucas De Marchi
2024-08-07 8:13 ` Daniel Gomez
2024-08-07 11:25 ` Lucas De Marchi
2024-08-06 23:09 ` [PATCH 05/12] accessiblity/speakup: genmap and makemapdata require linux/version.h Daniel Gomez via B4 Relay
2024-08-07 15:34 ` Masahiro Yamada
2024-08-06 23:09 ` [PATCH 06/12] selinux/genheaders: include bitsperlong and posix_types headers Daniel Gomez via B4 Relay
2024-08-07 15:29 ` Paul Moore
2024-08-07 15:38 ` Nicolas Schier
2024-08-07 15:44 ` Masahiro Yamada
2024-08-07 16:20 ` Paul Moore
2024-08-07 21:41 ` Daniel Gomez
2024-08-08 11:12 ` Nicolas Schier
2024-08-06 23:09 ` [PATCH 07/12] selinux/mdp: " Daniel Gomez via B4 Relay
2024-08-06 23:09 ` [PATCH 08/12] include: add elf.h support Daniel Gomez via B4 Relay
2024-08-07 11:04 ` Greg Kroah-Hartman
2024-08-07 14:13 ` Daniel Gomez
2024-08-07 14:18 ` Greg Kroah-Hartman
2024-08-07 15:46 ` Nicolas Schier
2024-08-23 22:54 ` Daniel Gomez
2024-08-30 19:53 ` Nicolas Schier
2024-09-01 16:15 ` Masahiro Yamada
2024-09-05 8:56 ` Daniel Gomez
2024-09-05 23:58 ` Masahiro Yamada
2024-09-06 8:34 ` Daniel Gomez
2024-08-06 23:09 ` [PATCH 09/12] include: add endian.h support Daniel Gomez via B4 Relay
2024-08-06 23:09 ` [PATCH 10/12] scripts/mod: add byteswap support Daniel Gomez via B4 Relay
2024-08-06 23:09 ` [PATCH 11/12] tty/vt: conmakehash requires linux/limits.h Daniel Gomez via B4 Relay
2024-08-09 12:15 ` Masahiro Yamada
2024-08-09 13:47 ` Daniel Gomez (Samsung)
2024-08-06 23:09 ` [PATCH 12/12] scripts/kallsyms: add compatibility support for macos Daniel Gomez via B4 Relay
2024-08-07 11:01 ` [PATCH 00/12] Enable build system on macOS hosts Greg Kroah-Hartman
2024-08-07 13:56 ` Daniel Gomez
2024-08-07 14:19 ` Greg Kroah-Hartman
2024-08-17 1:11 ` Barry Song
2024-08-18 16:55 ` Klaus Jensen
2024-08-23 22:37 ` Daniel Gomez
2024-08-24 5:51 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240807-macos-build-support-v1-3-4cd1ded85694@samsung.com \
--to=devnull+da.gomez.samsung.com@kernel.org \
--cc=airlied@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=chris@the-brannons.com \
--cc=d+samsung@kruces.com \
--cc=da.gomez@samsung.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gost.dev@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=james.morse@arm.com \
--cc=jirislaby@kernel.org \
--cc=justinstitt@google.com \
--cc=kirk@reisers.ca \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=lucas.demarchi@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=masahiroy@kernel.org \
--cc=maz@kernel.org \
--cc=me@kloenk.dev \
--cc=morbo@google.com \
--cc=mripard@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
--cc=oliver.upton@linux.dev \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=rodrigo.vivi@intel.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=selinux@vger.kernel.org \
--cc=speakup@linux-speakup.org \
--cc=stephen.smalley.work@gmail.com \
--cc=suzuki.poulose@arm.com \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=w.d.hubbs@gmail.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox