diff options
| author | wsnipex <wsnipex@a1.net> | 2015-10-22 16:18:26 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2015-10-23 14:31:17 +0200 |
| commit | 98b7d16fba57cc66e6c1a35dd6212e90e61a6f9d (patch) | |
| tree | ea4f309341c6df7be2b055217f128b504f0bc878 /tools/depends/target/libuuid | |
| parent | d4e7b129deaf92594b2089efa104e33a0ccba5d1 (diff) | |
[depends] switch libuuid implementation to e2fsprogs
this one compiles on droid as well
Diffstat (limited to 'tools/depends/target/libuuid')
| -rw-r--r-- | tools/depends/target/libuuid/Makefile | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/tools/depends/target/libuuid/Makefile b/tools/depends/target/libuuid/Makefile index 5dd6747b1f..92c9157242 100644 --- a/tools/depends/target/libuuid/Makefile +++ b/tools/depends/target/libuuid/Makefile @@ -1,21 +1,15 @@ include ../../Makefile.include DEPS= ../../Makefile.include Makefile +# We use uuid from e2fsprogs since this easily cross-compiles on android, while util-linux does not. # lib name, version LIBNAME=libuuid -VERSION=2.20.0 -SOURCE=util-linux-2.20.1 -ARCHIVE=$(SOURCE).tar.gz +VERSION=1.42.13 +SOURCE=e2fsprogs-1.42.13 +ARCHIVE=$(SOURCE).tar.xz -# configuration settings -CONFIGURE=echo "scanf_cv_type_modifier=as" > config.cache; \ - ./configure --prefix=$(PREFIX) --cache-file=config.cache \ - --disable-shared --disable-mount --disable-fsck --disable-partx --disable-libblkid \ - --disable-libmount --disable-mountpoint --disable-nls --disable-rpath --disable-agetty \ - --disable-cramfs --disable-switch_root --disable-pivot_root --disable-fallocate \ - --disable-unshare --disable-rename --disable-schedutils --disable-wall --without-ncurses -LIBDYLIB=$(PLATFORM)/libuuid/src/.libs/$(LIBNAME).a +LIBDYLIB=$(PLATFORM)/lib/$(LIBNAME).a all: .installed-$(PLATFORM) @@ -25,17 +19,17 @@ $(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) + cd $(PLATFORM); ./configure --prefix=$(PREFIX) --disable-fsck $(LIBDYLIB): $(PLATFORM) - $(MAKE) -C $(PLATFORM)/libuuid + cd $(PLATFORM)/lib/uuid ; $(MAKE) -j1 .installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM)/libuuid install + cd $(PLATFORM)/lib/uuid ; $(MAKE) -j1 install touch $@ clean: - $(MAKE) -C $(PLATFORM)/libuuid clean + $(MAKE) -C $(PLATFORM) clean rm -f .installed-$(PLATFORM) distclean:: |