CVS commit: pkgsrc/devel/libuuid

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Dec 18 21:11:16 UTC 2025

Modified Files:
        pkgsrc/devel/libuuid: distinfo
Added Files:
        pkgsrc/devel/libuuid/patches: patch-libuuid_src_uuid__time.c

Log Message:
libuuid: fix build on Darwin using upstream commit


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/libuuid/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libuuid/patches/patch-libuuid_src_uuid__time.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libuuid/distinfo
diff -u pkgsrc/devel/libuuid/distinfo:1.28 pkgsrc/devel/libuuid/distinfo:1.29
--- pkgsrc/devel/libuuid/distinfo:1.28  Tue Feb 18 15:14:51 2025
+++ pkgsrc/devel/libuuid/distinfo       Thu Dec 18 21:11:16 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2025/02/18 15:14:51 wiz Exp $
+$NetBSD: distinfo,v 1.29 2025/12/18 21:11:16 maya Exp $
 
 BLAKE2s (util-linux-2.40.2.tar.xz) = e83f6b7f6b202ca27e8829ed7d70c4a37054925652f72de810908c4590f9ae68
 SHA512 (util-linux-2.40.2.tar.xz) = ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2
@@ -18,4 +18,5 @@ SHA1 (patch-libfdisk_docs_Makefile.in) =
 SHA1 (patch-libmount_docs_Makefile.in) = cba6e071e4b26896ca6bae47ae47ebe662b2da4a
 SHA1 (patch-libsmartcols_docs_Makefile.in) = c3a77d42252be62b979467f0ad84ed0f44ef6f30
 SHA1 (patch-libuuid_src_gen__uuid.c) = 05dd91d2fe44f4cfd82120e52a7be1dab80d0ea2
+SHA1 (patch-libuuid_src_uuid__time.c) = 7a876b6bb2f4f043c34bfbfdbea1760435442fb8
 SHA1 (patch-tools_config-gen) = f36e05c517d625e5b0b3fce1d5a8b3f2b02c7def

Added files:

Index: pkgsrc/devel/libuuid/patches/patch-libuuid_src_uuid__time.c
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-libuuid_src_uuid__time.c:1.1
--- /dev/null   Thu Dec 18 21:11:16 2025
+++ pkgsrc/devel/libuuid/patches/patch-libuuid_src_uuid__time.c Thu Dec 18 21:11:16 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-libuuid_src_uuid__time.c,v 1.1 2025/12/18 21:11:16 maya Exp $
+
+Pull upstream commit to fix build on Darwin
+https://github.com/util-linux/util-linux/commit/e47c6f751a7ef87640c61316ada774e8e9cc6b07
+
+Weak aliases are not supported by clang on Darwin.
+Instead this fix uses inline asm to make `_uuid_time` an alias to
+`___uuid_time`
+
+--- libuuid/src/uuid_time.c.orig       2025-12-18 20:52:14.039965440 +0000
++++ 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