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>,
"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>,
"Simona Vetter" <simona.vetter@ffwll.ch>
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 v2 2/8] file2alias: fix uuid_t definitions for macos
Date: Fri, 06 Sep 2024 13:01:29 +0200 [thread overview]
Message-ID: <20240906-macos-build-support-v2-2-06beff418848@samsung.com> (raw)
In-Reply-To: <20240906-macos-build-support-v2-0-06beff418848@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, define the _UUID_T and
__GETHOSTUUID_ in file2alias HOSTCFLAGS.
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.
Suggested-by: Nicolas Schier <nicolas@fjasle.eu>
Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
scripts/mod/Makefile | 2 ++
scripts/mod/file2alias.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index c729bc936bae..75c12c045f21 100644
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -8,6 +8,8 @@ modpost-objs := modpost.o file2alias.o sumversion.o symsearch.o
devicetable-offsets-file := devicetable-offsets.h
+HOSTCFLAGS_file2alias.o += -D_UUID_T -D__GETHOSTUUID_H
+
$(obj)/$(devicetable-offsets-file): $(obj)/devicetable-offsets.s FORCE
$(call filechk,offsets,__DEVICETABLE_OFFSETS_H__)
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
--
2.46.0
next prev parent reply other threads:[~2024-09-06 11:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 11:01 [PATCH v2 0/8] Enable build system on macOS hosts Daniel Gomez via B4 Relay
2024-09-06 11:01 ` [PATCH v2 1/8] scripts: subarch.include: fix SUBARCH " Daniel Gomez via B4 Relay
2024-09-08 14:05 ` Masahiro Yamada
2024-09-06 11:01 ` Daniel Gomez via B4 Relay [this message]
2024-09-07 23:56 ` [PATCH v2 2/8] file2alias: fix uuid_t definitions for macos Masahiro Yamada
2024-09-08 17:40 ` Daniel Gomez (Samsung)
2024-09-09 5:40 ` Masahiro Yamada
2024-10-03 22:32 ` Andy Shevchenko
2024-09-06 11:01 ` [PATCH v2 3/8] drm/xe: xe_gen_wa_oob: fix program_invocation_short_name " Daniel Gomez via B4 Relay
2024-09-06 14:39 ` Masahiro Yamada
2024-09-06 15:32 ` Jani Nikula
2024-09-19 19:12 ` Daniel Gomez
2024-09-06 11:01 ` [PATCH v2 4/8] arm64: nvhe: add bee-headers support Daniel Gomez via B4 Relay
2024-09-06 14:02 ` Masahiro Yamada
2024-09-07 9:27 ` Daniel Gomez (Samsung)
2024-09-08 1:17 ` Masahiro Yamada
2024-09-06 11:01 ` [PATCH v2 5/8] scripts: " Daniel Gomez via B4 Relay
2024-09-06 14:02 ` Masahiro Yamada
2024-09-06 11:01 ` [PATCH v2 6/8] selinux: do not include <linux/*.h> headers from host programs Daniel Gomez via B4 Relay
2024-09-06 14:56 ` Paul Moore
2024-09-06 15:07 ` Daniel Gomez (Samsung)
2024-09-06 11:01 ` [PATCH v2 7/8] selinux: move genheaders to security/selinux/ Daniel Gomez via B4 Relay
2024-09-06 14:54 ` Paul Moore
2024-09-06 15:06 ` Daniel Gomez (Samsung)
2024-09-06 15:37 ` Masahiro Yamada
2024-09-06 15:47 ` Paul Moore
2024-09-06 11:01 ` [PATCH v2 8/8] Documentation: add howto build in macos Daniel Gomez via B4 Relay
2024-09-07 8:33 ` Masahiro Yamada
2024-09-07 9:32 ` Daniel Gomez (Samsung)
2024-09-08 1:29 ` Masahiro Yamada
2024-09-08 9:03 ` Marc Zyngier
2024-09-24 8:51 ` Daniel Gomez
2024-09-12 12:02 ` [PATCH v2 0/8] Enable build system on macOS hosts Jeff Xie
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=20240906-macos-build-support-v2-2-06beff418848@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=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=simona.vetter@ffwll.ch \
--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;
as well as URLs for NNTP newsgroup(s).