diff options
| author | Robert Marko | 2024-06-25 15:53:11 +0000 |
|---|---|---|
| committer | Robert Marko | 2024-06-26 09:21:04 +0000 |
| commit | 843b51b26d903c044610bf9a31afe24fa306efc3 (patch) | |
| tree | 80f964477c3a3c7122a6887d66654931048768ef | |
| parent | 215d5bbe4e9715555e6ccffcf99264c5e89bd470 (diff) | |
| download | openwrt-843b51b26d903c044610bf9a31afe24fa306efc3.tar.gz | |
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 <robimarko@gmail.com>
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/mtd-utils/Makefile | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tools/Makefile b/tools/Makefile index df6cb64e52..b16c5d9c5b 100644 --- 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 f53dbdcc4e..3bcfabc3ad 100644 --- 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 \ |