[openwrt/openwrt] tools: util-linux: fix static libuuid pkgconf

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 26 02:08:28 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/9567dbe3a12b964ff9d29a83f443c6e804640083

commit 9567dbe3a12b964ff9d29a83f443c6e804640083
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Tue Sep 24 13:30:20 2024 -0700

    tools: util-linux: fix static libuuid pkgconf
    
    Fixes uuid.pc usage on hosts with an older glibc.
    
    Signed-off-by: Rosen Penev <rosenp at 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 at gmail.com>
---
 .../util-linux/patches/110-pkgconfig-static.patch  | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tools/util-linux/patches/110-pkgconfig-static.patch b/tools/util-linux/patches/110-pkgconfig-static.patch
new file mode 100644
index 0000000000..d61ae313bf
--- /dev/null
+++ b/tools/util-linux/patches/110-pkgconfig-static.patch
@@ -0,0 +1,24 @@
+From 81ea117e0396274808a77d40bf11af44ea047285 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp at 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 at 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




More information about the lede-commits mailing list