aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-07-31 12:41:13 +0200
committerDaniel Golle <daniel@makrotopia.org>2023-08-13 16:29:58 +0100
commitf241408f1843915500fd14e4bfaa7c08a5ff1039 (patch)
treecfb4cea3a72a074bb71dcd2d45001ae2dec66bbe
parent9d10944de77085d324e411af5439f1397bd1163d (diff)
downloadupstream-f241408f1843915500fd14e4bfaa7c08a5ff1039.tar.gz
upstream-f241408f1843915500fd14e4bfaa7c08a5ff1039.tar.bz2
upstream-f241408f1843915500fd14e4bfaa7c08a5ff1039.zip
arm-trusted-firmware-tools: fix build on macOS/Darwin
Resolve conflicts with the uuid type from darwin system headers Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry picked from commit 16c37ba9136ff431c7e3c97cc27e4ea166b8020a)
-rw-r--r--package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch b/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch
new file mode 100644
index 0000000000..6bc8192f44
--- /dev/null
+++ b/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch
@@ -0,0 +1,21 @@
+--- a/tools/fiptool/fiptool.c
++++ b/tools/fiptool/fiptool.c
+@@ -3,7 +3,7 @@
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+-
++#define _DARWIN_C_SOURCE
+ #ifndef _MSC_VER
+ #include <sys/mount.h>
+ #endif
+@@ -18,6 +18,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
++
++#define uuid_t fiptool_uuid_t
+
+ #include "fiptool.h"
+ #include "tbbr_config.h"