tools: util-linux: fix static libuuid pkgconf
authorRosen Penev <rosenp@gmail.com>
Tue, 24 Sep 2024 20:30:20 +0000 (13:30 -0700)
committerRobert Marko <robimarko@gmail.com>
Thu, 26 Sep 2024 09:08:23 +0000 (11:08 +0200)
Fixes uuid.pc usage on hosts with an older glibc.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16480
Link: https://github.com/openwrt/openwrt/pull/16480
Link: https://github.com/openwrt/openwrt/pull/16480
Signed-off-by: Robert Marko <robimarko@gmail.com>
tools/util-linux/patches/110-pkgconfig-static.patch [new file with mode: 0644]

diff --git a/tools/util-linux/patches/110-pkgconfig-static.patch b/tools/util-linux/patches/110-pkgconfig-static.patch
new file mode 100644 (file)
index 0000000..d61ae31
--- /dev/null
@@ -0,0 +1,24 @@
+From 81ea117e0396274808a77d40bf11af44ea047285 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Mon, 23 Sep 2024 12:01:40 +0200
+Subject: [PATCH] pkgconfig: adjust for static libraries
+
+OpenWrt builds only static libuuid for tools. Adjust the pkgconfig file
+accordingly.
+
+Addresses: https://github.com/util-linux/util-linux/issues/3210
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ libuuid/uuid.pc.in | 2 +-
+ 1 file changed, 1 insertions(+), 2 deletions(-)
+
+--- a/libuuid/uuid.pc.in
++++ b/libuuid/uuid.pc.in
+@@ -6,6 +6,5 @@ includedir=@includedir@
+ Name: uuid
+ Description: Universally unique id library
+ Version: @LIBUUID_VERSION@
+-Requires:
+ Cflags: -I${includedir}/uuid
+-Libs: -L${libdir} -luuid
++Libs: -L${libdir} -luuid -lpthread