From 8831ac925e7c955584f75420111f6c0c210539a6 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 28 Mar 2018 23:17:52 +0000
Subject:  Next tentative step in fixing util-linux...

---
 sub/util-linux/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'sub/util-linux')

diff --git a/sub/util-linux/Makefile b/sub/util-linux/Makefile
index 38458bf..29c19be 100644
--- a/sub/util-linux/Makefile
+++ b/sub/util-linux/Makefile
@@ -13,14 +13,12 @@ UTLX_CONFIGURE_OPTIONS := \
 --disable-shared \
 --disable-widechar \
 --disable-libuuid \
---disable-libblkid \
---disable-libsmartcols \
 --disable-all-programs \
+--enable-libsmartcols \
 --enable-losetup \
---enable-fdisk \
---enable-mkswap \
+--enable-libblkid \
+--enable-libmount \
 --enable-mount \
---enable-umount \
 --disable-bash-completion \
 --disable-pylibmount \
 --disable-pg-bell \
@@ -29,7 +27,6 @@ UTLX_CONFIGURE_OPTIONS := \
 --disable-colors-default \
 --with-gnu-ld \
 --without-util \
---without-termcap \
 --without-libiconv-prefix \
 --without-selinux \
 --without-audit \
@@ -64,7 +61,7 @@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured: $(OUTPUT)/build-build/.lh_$(U
 	exec setuidgid $(NORMALUSER) s6-touch $@
 
 $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_built: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
-	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) LDFLAGS=$(UTLX_MAKELDFLAGS)
+	exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) fdisk mount umount losetup mkswap LDFLAGS=$(UTLX_MAKELDFLAGS)
 	exec setuidgid $(NORMALUSER) s6-touch $@
 
 $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_installed: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
-- 
cgit v1.3.1