From: Michael Pratt Date: Thu, 3 Jul 2025 19:09:25 +0000 (-0400) Subject: tools/util-linux: include macOS system uuid header X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89056bd7b109ff4264f07cf721e6d9f4b7ad983e;p=thirdparty%2Fopenwrt.git tools/util-linux: include macOS system uuid header The type definition of uuid_string_t and possibly other details used by macOS SDKs like XCode is missing from util-linux. Headers on macOS have a different inclusion guard compared to the unique util-linux "_UL" prefix. This uuid.h header is guaranteed to be present since macOS 10.8 and iOS 6 even without the presence of XCode or other SDKs on the system, so adding an include_next directive is safe after checking for clang. Link: https://developer.apple.com/documentation/foundation/uuid Link: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/uuid.3.html Tested-by: Georgi Valkov # macOS Signed-off-by: Michael Pratt Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko --- diff --git a/tools/util-linux/patches/102-macos-uuid-next.patch b/tools/util-linux/patches/102-macos-uuid-next.patch new file mode 100644 index 00000000000..36346fd5227 --- /dev/null +++ b/tools/util-linux/patches/102-macos-uuid-next.patch @@ -0,0 +1,13 @@ +--- a/libuuid/src/uuid.h ++++ b/libuuid/src/uuid.h +@@ -35,6 +35,10 @@ + #ifndef _UL_LIBUUID_UUID_H + #define _UL_LIBUUID_UUID_H + ++#if defined(__clang__) && defined(__APPLE__) ++#include_next ++#endif ++ + #include + #ifndef _WIN32 + #include