mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
dd4161c39d
Buildroot commit31af509b4fbumped util-linux from version 2.40.2 to 2.41.1. Upstream release 2.40.3 containse143539d30which unconditionally adds -lpthread to uuid.pc causing build errors for other packages using non-threaded toolchains like erofs-utils. Fixes: https://autobuild.buildroot.net/results/582/5827995db2a805e0c8a04fde8498eff6f28aa6d8/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From a06adacd1009174b7ca35f529a2db165f6c1f3aa Mon Sep 17 00:00:00 2001
|
|
From: Bernd Kuhls <bernd@kuhls.net>
|
|
Date: Fri, 16 Jan 2026 23:33:34 +0100
|
|
Subject: [PATCH] autotools: optionally add libpthread to uuid.pc
|
|
|
|
Fixes https://github.com/util-linux/util-linux/issues/3210#issuecomment-3477915953
|
|
|
|
Upstream: https://github.com/util-linux/util-linux/commit/d88a62e4cd385e07b3cb8fb309bbb03981ea2970
|
|
|
|
[Bernd: backported to 2.41.3]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
Makefile.am | 1 +
|
|
libuuid/uuid.pc.in | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 01e99701d..cd1d157ce 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -189,6 +189,7 @@ edit_cmd = sed \
|
|
-e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
|
|
-e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
|
|
-e 's|@SOCKET_LIBS[@]|$(SOCKET_LIBS)|g' \
|
|
+ -e 's|@PTHREAD_LIBS[@]|$(PTHREAD_LIBS)|g' \
|
|
-e 's|@VERSION[@]|$(VERSION)|g' \
|
|
-e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \
|
|
-e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \
|
|
diff --git a/libuuid/uuid.pc.in b/libuuid/uuid.pc.in
|
|
index 51929fe80..a40dc6644 100644
|
|
--- a/libuuid/uuid.pc.in
|
|
+++ b/libuuid/uuid.pc.in
|
|
@@ -7,5 +7,5 @@ Name: uuid
|
|
Description: Universally unique id library
|
|
Version: @LIBUUID_VERSION@
|
|
Cflags: -I${includedir}/uuid
|
|
-Libs.private: @SOCKET_LIBS@ -lpthread
|
|
+Libs.private: @SOCKET_LIBS@ @PTHREAD_LIBS@
|
|
Libs: -L${libdir} -luuid
|
|
--
|
|
2.47.3
|
|
|