From b6115283456a51cabd9c256ffc2a5003333b8309 Mon Sep 17 00:00:00 2001
From: fuzzard <fuzzard@kodi.tv>
Date: Fri, 31 Dec 2021 18:46:34 +1000
Subject: [tools/depends][target] bump libuuid

continue to use e2fsprog libuuid. This is purely legacy reasoning, as util-linux
libuuid builds and runs fine with android now
---
 tools/depends/target/libuuid/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/depends/target/libuuid/Makefile b/tools/depends/target/libuuid/Makefile
index 92c9157242..6d8ee1d061 100644
--- a/tools/depends/target/libuuid/Makefile
+++ b/tools/depends/target/libuuid/Makefile
@@ -1,14 +1,13 @@
 include ../../Makefile.include
 DEPS= ../../Makefile.include Makefile
 
-# We use uuid from e2fsprogs since this easily cross-compiles on android, while util-linux does not.
+# We use uuid from e2fsprogs for legacy. util-linux works fine on android now
 # lib name, version
 LIBNAME=libuuid
-VERSION=1.42.13
-SOURCE=e2fsprogs-1.42.13
+VERSION=1.46.5
+SOURCE=e2fsprogs-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
 
-
 LIBDYLIB=$(PLATFORM)/lib/$(LIBNAME).a
 
 all: .installed-$(PLATFORM)
@@ -19,12 +18,14 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); ./configure --prefix=$(PREFIX) --disable-fsck
+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) --disable-fsck --enable-libuuid
 
 $(LIBDYLIB): $(PLATFORM)
+  # -j1 is required due to concurrency failures with dirpath.h generation
 	cd $(PLATFORM)/lib/uuid ; $(MAKE) -j1
 
 .installed-$(PLATFORM): $(LIBDYLIB)
+  # -j1 is required due to concurrency failures with dirpath.h generation
 	cd $(PLATFORM)/lib/uuid ; $(MAKE) -j1 install
 	touch $@
 
-- 
cgit v1.2.3