[patch] ebuild and ver. sym map patches

file_931328.txt (text/plain), 2.71 KB, created by nvinson234 on 2024-06-02 18:49:46 UTC

From d54e8880c691e42204a0302e22a7d1b9ae433221 Mon Sep 17 00:00:00 2001
From: Nicholas Vinson <[e-mail]>
Date: Sun, 2 Jun 2024 14:44:15 -0400
Subject: [PATCH] sys-apps/util-linux: Apply lld ver sym map patch

---
 sys-apps/util-linux/files/lld-ver-sym.patch   | 43 +++++++++++++++++++
 .../util-linux/util-linux-2.40.1-r3.ebuild    |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 sys-apps/util-linux/files/lld-ver-sym.patch

diff --git a/sys-apps/util-linux/files/lld-ver-sym.patch b/sys-apps/util-linux/files/lld-ver-sym.patch
new file mode 100644
index 0000000..024ff5c
--- /dev/null
+++ b/sys-apps/util-linux/files/lld-ver-sym.patch
@@ -0,0 +1,43 @@
+Gentoo bug 931328 (https://bugs.gentoo.org/931328)
+
+From 86d3f3f03231d25f9cbf18d83aeeccd2225dd246 Mon Sep 17 00:00:00 2001
+From: Nicholas Vinson <[e-mail]>
+Date: Wed, 15 May 2024 11:14:54 -0400
+Subject: [PATCH] Conditionally add uuid_time64 to sym. version map
+
+The symbol uuid_time64 is conditionally defined. It only exists on
+32-bit platforms that use the glibc library and enable support for
+the 64-bit time_t type.
+
+For all other platforms, the symbol is undefined. As a result, when
+ld.lld version 17 or newer is used with default flags, ld.lld will
+reject the symbol map with the error:
+
+    version script assignment of 'UUID_2.40' to symbol 'uuid_time64'
+    failed: symbol not defined
+
+To fix this issue, the reference to uuid_time64 is changed to
+uuid_time64*. The change to a glob pattern satisifies ld.lld and allows
+the library to link.
+
+fixes util-linux/util-linux#3036
+fixes Gentoo bug #931328
+
+Signed-off-by: Nicholas Vinson <[e-mail]>
+---
+ libuuid/src/libuuid.sym | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libuuid/src/libuuid.sym b/libuuid/src/libuuid.sym
+index 4c4b4eba2e..774228548a 100644
+--- a/libuuid/src/libuuid.sym
++++ b/libuuid/src/libuuid.sym
+@@ -57,7 +57,7 @@ global:
+  */
+ UUID_2.40 {
+ global:
+-        uuid_time64; /* only on 32bit architectures with 64bit time_t */
++        uuid_time64*; /* only on 32bit architectures with 64bit time_t */
+ } UUID_2.36;
+ 
+ /*
diff --git a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index 340527c..ea087c4 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -102,6 +102,10 @@ fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/lld-ver-sym.patch"
+)
+
 pkg_pretend() {
 	if use su && ! use suid ; then
 		elog "su will be installed as suid despite USE=-suid (bug #832092)"