Mercurial > vanilla

diff core/util-linux/util-linux.sh @ 1222:325631424c65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: bring back build function
author David Demelier <markand@malikania.fr>
date Wed, 27 Oct 2021 11:32:16 +0200
parents a47aaf9743a0
children 9867e578b1a9
line wrap: on
line diff
--- a/core/util-linux/util-linux.sh	Fri Oct 15 16:07:30 2021 +0200
+++ b/core/util-linux/util-linux.sh	Wed Oct 27 11:32:16 2021 +0200
@@ -103,53 +103,56 @@
 	with_selinux="--without-selinux"
 fi
 
-rm -rf $PKGNAME-$PKGVERSION
-tar xvf $PKGNAME-$PKGVERSION.tar.xz
-cd $PKGNAME-$PKGVERSION
+build()
+{
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
-# All these tools are provided by shadow instead:
-# --disable-chfn-chsh
-# --disable-chsh
-# --disable-login
-# --disable-nologin
-# --disable-su
-# --disable-vipw
+	# All these tools are provided by shadow instead:
+	# --disable-chfn-chsh
+	# --disable-chsh
+	# --disable-login
+	# --disable-nologin
+	# --disable-su
+	# --disable-vipw
 
-# The configure.ac script has hardcoded /sbin checks.
-sed -i -e 's|/sbin|/bin|' configure.ac
-autoreconf -vif
-CC="$CC" \
-CFLAGS="$CFLAGS" \
-LDFLAGS="$LDFLAGS" \
-LIBS="$LIBS" \
-./configure \
-	--build=$CBUILD \
-	--host=$CHOST \
-	--prefix=/usr \
-	--bindir=/bin \
-	--libdir=/lib \
-	--sbindir=/bin \
-	--disable-chfn-chsh \
-	--disable-gtk-doc \
-	--disable-login \
-	--disable-nologin \
-	--disable-su \
-	--disable-vipw \
-	--enable-libblkid \
-	--enable-libmount \
-	--enable-libsmartcols \
-	--enable-libuuid \
-	--enable-shared \
-	--without-systemd \
-	$with_audit \
-	$with_colors \
-	$with_components \
-	$with_nls \
-	$with_python \
-	$with_selinux
-make
-make install DESTDIR=$DESTDIR
-find $DESTDIR -type f -name "*.la" -delete
+	# The configure.ac script has hardcoded /sbin checks.
+	sed -i -e 's|/sbin|/bin|' configure.ac
+	autoreconf -vif
+	CC="$CC" \
+	CFLAGS="$CFLAGS" \
+	LDFLAGS="$LDFLAGS" \
+	LIBS="$LIBS" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix= \
+		--bindir=/bin \
+		--libdir=/lib \
+		--sbindir=/bin \
+		--disable-chfn-chsh \
+		--disable-gtk-doc \
+		--disable-login \
+		--disable-nologin \
+		--disable-su \
+		--disable-vipw \
+		--enable-libblkid \
+		--enable-libmount \
+		--enable-libsmartcols \
+		--enable-libuuid \
+		--enable-shared \
+		--without-systemd \
+		$with_audit \
+		$with_colors \
+		$with_components \
+		$with_nls \
+		$with_python \
+		$with_selinux
+	make
+	make install DESTDIR=$DESTDIR
+	find $DESTDIR -type f -name "*.la" -delete
 
-cd ..
-rm -rf $PKGNAME-$PKGVERSION
+	cd ..
+	rm -rf $PKGNAME-$PKGVERSION
+}