tools: mtd-utils: use libuuid provided by util-linux

Now that util-linux is building libuuid we can simply use that instead
of manually pointing to e2fsprogs libuuid so we can disable building
libuuid in e2fsprogs.

Link: https://github.com/openwrt/openwrt/pull/15806
Signed-off-by: Robert Marko <[email protected]>

diff --git a/tools/Makefile b/tools/Makefile
index df6cb64e52f5859ebf34395764b5fc8cbace33d8..b16c5d9c5b1e6c5e003f6dba86eabe77eed0e953 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -121,7 +121,7 @@ $(curdir)/mklibs/compile := $(curdir)/libtool/compile
 $(curdir)/mold/compile := $(curdir)/cmake/compile $(curdir)/zlib/compile $(curdir)/zstd/compile
 $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
 $(curdir)/mpfr/compile := $(curdir)/gmp/compile
-$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile
+$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/zlib/compile $(curdir)/util-linux/compile
 $(curdir)/padjffs2/compile := $(curdir)/findutils/compile
 $(curdir)/patchelf/compile := $(curdir)/libtool/compile
 $(curdir)/pkgconf/compile := $(curdir)/meson/compile

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index f53dbdcc4e0d0865285de8a5ec8818cdb0ea7ffe..3bcfabc3ad587c74573ecf45642bf4f1008df19b 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -29,9 +29,6 @@ ifneq ($(HOST_OS),Linux)
        -include fls.h
 endif
 
-HOST_CONFIGURE_VARS+= \
-       UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
-
 HOST_CONFIGURE_ARGS+= \
        --without-tests \
        --without-crypto \