From 8b0f892b31086cbb0683fecc2b9f23d7ce24c5ee Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Tue, 25 Jun 2024 17:51:24 +0200 Subject: [PATCH] tools: util-linux: build libuuid util-linux usually provides libuuid, and is preffered by mtd-utils so lets enable building libuuid so we can disable it later in e2fsprogs. Only the static version of library is intentionally built. Link: https://github.com/openwrt/openwrt/pull/15806 Signed-off-by: Robert Marko --- tools/util-linux/Makefile | 2 ++ .../patches/101-macos-weak-aliases.patch | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 tools/util-linux/patches/101-macos-weak-aliases.patch diff --git a/tools/util-linux/Makefile b/tools/util-linux/Makefile index cfeb85840042..a3a6c2be4134 100644 --- a/tools/util-linux/Makefile +++ b/tools/util-linux/Makefile @@ -21,8 +21,10 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk HOST_CONFIGURE_ARGS += \ + --disable-shared \ --disable-all-programs \ --enable-hexdump \ + --enable-libuuid \ --without-util \ --without-selinux \ --without-audit \ diff --git a/tools/util-linux/patches/101-macos-weak-aliases.patch b/tools/util-linux/patches/101-macos-weak-aliases.patch new file mode 100644 index 000000000000..e5d0f9d0b839 --- /dev/null +++ b/tools/util-linux/patches/101-macos-weak-aliases.patch @@ -0,0 +1,26 @@ +From 9445f477cfcfb3615ffde8f93b1b98c809ee4eca Mon Sep 17 00:00:00 2001 +From: Eugene Gershnik +Date: Mon, 6 May 2024 09:29:39 -0700 +Subject: [PATCH] This re-enables build on macOS. + +Weak aliases are not supported by clang on Darwin. +Instead this fix uses inline asm to make `_uuid_time` and alias to `___uuid_time` + +Fixes util-linux/util-linux#2873 +--- + libuuid/src/uuid_time.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/libuuid/src/uuid_time.c ++++ b/libuuid/src/uuid_time.c +@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, stru + } + #if defined(__USE_TIME_BITS64) && defined(__GLIBC__) + extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); ++#elif defined(__clang__) && defined(__APPLE__) ++__asm__(".globl _uuid_time"); ++__asm__(".set _uuid_time, ___uuid_time"); ++extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); + #else + extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); + #endif -- 2.30.2