diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-01-20 08:11:03 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 08:11:03 +1000 |
| commit | 1be07f3ee4545a566e0102f607eba80197f43409 (patch) | |
| tree | e1f676c200c9dc07ff1898a2dbf4047386f15cc9 /tools/depends | |
| parent | ef472bca0c36a8467eafa17173aa63c7abb4a601 (diff) | |
| parent | b6115283456a51cabd9c256ffc2a5003333b8309 (diff) | |
Merge pull request #20758 from fuzzard/depends_libuuid
[tools/depends][target] bump libuuid
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/libuuid/Makefile | 11 |
1 files 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 $@ |