[openwrt/openwrt] tools: e2fsprogs: bypass libuuid check

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


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/676a2ab03b37895ae47f7730cb9abcee38ebe774

commit 676a2ab03b37895ae47f7730cb9abcee38ebe774
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Wed Sep 25 10:42:15 2024 -0700

    tools: e2fsprogs: bypass libuuid check
    
    The check is the wrong way around. It uses AC_CHECK_LIBS and then
    pkg-config, probably because the latter is a second class citizen.
    
    Just bypass it. pkg-config gets used anyway.
    
    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>
---
 tools/e2fsprogs/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 8a8a2e181f..50c3888b64 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -33,6 +33,10 @@ HOST_CONFIGURE_ARGS += \
 	--disable-fuse2fs \
 	--with-crond-dir=no
 
+# The following uses pkg-config the wrong way around. Just override it.
+HOST_CONFIGURE_VARS += \
+	ac_cv_lib_uuid_uuid_generate=yes
+
 define Host/Prepare
 	$(call Host/Prepare/Default)
 	rm -rf $(HOST_BUILD_DIR)/doc




More information about the lede-commits mailing list