[PATCH] util-linux: fix bad pkgconf variable

Rosen Penev rosenp at gmail.com
Tue Jan 19 19:16:07 EST 2021


Because of the lib prefix, it's not getting substituted properly and
breaks compilation of other packages.

Fixes error with at least btrfs-progs:

Package '@LIBSELINUX@', required by 'mount', not found
Package '@LIBCRYPTSETUP@', required by 'mount', not foun

Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 package/utils/util-linux/Makefile                     |  2 +-
 .../util-linux/patches/010-mount-pkgconfig.patch      | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 package/utils/util-linux/patches/010-mount-pkgconfig.patch

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 31a66493e9..7551fe867b 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
 PKG_VERSION:=2.36.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36
diff --git a/package/utils/util-linux/patches/010-mount-pkgconfig.patch b/package/utils/util-linux/patches/010-mount-pkgconfig.patch
new file mode 100644
index 0000000000..a0f9bf3a3c
--- /dev/null
+++ b/package/utils/util-linux/patches/010-mount-pkgconfig.patch
@@ -0,0 +1,11 @@
+--- a/libmount/mount.pc.in
++++ b/libmount/mount.pc.in
+@@ -17,7 +17,7 @@ includedir=@includedir@
+ Name: mount
+ Description: mount library
+ Version: @LIBMOUNT_VERSION@
+-Requires.private: blkid @LIBSELINUX@ @LIBCRYPTSETUP@
++Requires.private: blkid @SELINUX_LIBS@ @CRYPTSETUP_LIBS@
+ Cflags: -I${includedir}/libmount
+ Libs: -L${libdir} -lmount
+ Libs.private: @LIBDL@
-- 
2.29.2




More information about the openwrt-devel mailing list