diff options
| author | Thomas Weißschuh | 2025-06-26 10:54:40 +0000 |
|---|---|---|
| committer | Nick Hainke | 2025-07-01 21:04:15 +0000 |
| commit | c2520c1910813441eec5e4cc5024f610e0318cc9 (patch) | |
| tree | 47a1d064e46794b1d5d7fa29924ef005842566ff | |
| parent | 9add155a20e826d2f63510c4e85b4e52a8c03e73 (diff) | |
| download | openwrt-c2520c1910813441eec5e4cc5024f610e0318cc9.tar.gz | |
tools: util-linux: update to v2.41.1
Release Notes:
https://www.kernel.org/pub/linux/utils/util-linux/v2.41/v2.41.1-ReleaseNotes
Remove upstreamed:
tools/util-linux/patches/101-macos-weak-aliases.patch
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
Link: https://github.com/openwrt/openwrt/pull/19236
Signed-off-by: Nick Hainke <vincent@systemli.org>
| -rw-r--r-- | tools/util-linux/Makefile | 4 | ||||
| -rw-r--r-- | tools/util-linux/patches/101-macos-weak-aliases.patch | 26 |
2 files changed, 2 insertions, 28 deletions
diff --git a/tools/util-linux/Makefile b/tools/util-linux/Makefile index 37c9366f37..fd90f31b5f 100644 --- a/tools/util-linux/Makefile +++ b/tools/util-linux/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.41 +PKG_VERSION:=2.41.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41 -PKG_HASH:=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6 +PKG_HASH:=be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_FIXUP:=autoreconf diff --git a/tools/util-linux/patches/101-macos-weak-aliases.patch b/tools/util-linux/patches/101-macos-weak-aliases.patch deleted file mode 100644 index 13acccd535..0000000000 --- a/tools/util-linux/patches/101-macos-weak-aliases.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9445f477cfcfb3615ffde8f93b1b98c809ee4eca Mon Sep 17 00:00:00 2001 -From: Eugene Gershnik <gershnik@users.noreply.github.com> -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 -@@ -144,6 +144,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 |