util-linux: update to 2.37.1.
This commit is contained in:
parent
1bb5e87f3f
commit
95fa0500c6
|
@ -1,20 +0,0 @@
|
|||
Define __SWORD_TYPE for musl.
|
||||
|
||||
--- a/sys-utils/switch_root.c.orig 2014-09-20 21:33:27.551345526 +0200
|
||||
+++ b/sys-utils/switch_root.c 2014-09-20 21:34:17.958584374 +0200
|
||||
@@ -47,6 +47,15 @@
|
||||
#define MNT_DETACH 0x00000002 /* Just detach from the tree */
|
||||
#endif
|
||||
|
||||
+#ifndef __SWORD_TYPE
|
||||
+# if __WORDSIZE == 32 /* System word size */
|
||||
+# define __SWORD_TYPE int
|
||||
+# else /* __WORDSIZE == 64 */
|
||||
+# define __SWORD_TYPE long int
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/* remove all files/directories below dirName -- don't cross mountpoints */
|
||||
static int recursiveRemove(int fd)
|
||||
{
|
|
@ -1,19 +1,28 @@
|
|||
# Template file for 'util-linux'
|
||||
# Keep this package sync with util-linux-libs
|
||||
# Keep this package sync with util-linux-common
|
||||
pkgname=util-linux
|
||||
version=2.36.2
|
||||
version=2.37.1
|
||||
revision=1
|
||||
hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
|
||||
build_style=gnu-configure
|
||||
configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
|
||||
--enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
|
||||
--enable-vipw --enable-newgrp --enable-chfn-chsh --with-systemdsystemunitdir=no
|
||||
--with-udev --without-python --enable-write"
|
||||
hostmakedepends="gettext pkg-config"
|
||||
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
|
||||
eudev-libudev-devel"
|
||||
# FIXME: don't be so strict on the dependency
|
||||
depends="util-linux-libs-${version}_${revision}"
|
||||
depends="libfdisk>=${version}_1<=${version}_9999
|
||||
libblkid>=${version}_1<=${version}_9999
|
||||
libmount>=${version}_1<=${version}_9999
|
||||
libsmartcols>=${version}_1<=${version}_9999
|
||||
libuuid>=${version}_1<=${version}_9999"
|
||||
checkdepends="xz tar iproute2 socat procps-ng bc"
|
||||
short_desc="Miscellaneous linux utilities"
|
||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
|
||||
distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
|
||||
checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
|
||||
checksum=8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76
|
||||
|
||||
# Create uuidd system account for uuidd.
|
||||
system_accounts="_uuidd"
|
||||
|
@ -30,29 +39,13 @@ alternatives="
|
|||
logger:logger.1:/usr/share/man/man1/${pkgname}-logger.1
|
||||
"
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
./configure ${configure_args} \
|
||||
--exec-prefix=/usr --libdir=/usr/lib \
|
||||
--bindir=/usr/bin --sbindir=/usr/bin \
|
||||
--enable-libuuid --disable-makeinstall-chown \
|
||||
--enable-libblkid --enable-fsck --disable-rpath \
|
||||
--enable-fs-paths-extra=/usr/sbin:/usr/bin \
|
||||
--enable-vipw --enable-newgrp --enable-chfn-chsh \
|
||||
--with-systemdsystemunitdir=no \
|
||||
--with-udev --without-python \
|
||||
--enable-write
|
||||
}
|
||||
|
||||
do_build() {
|
||||
make ${makejobs}
|
||||
}
|
||||
|
||||
do_check() {
|
||||
make -k check
|
||||
post_extract() {
|
||||
# hung inside xbps-src
|
||||
rm -f tests/ts/lsns/ioctl_ns
|
||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||
# Known broken
|
||||
rm -f tests/ts/col/multibyte
|
||||
fi
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
@ -75,4 +68,6 @@ do_install() {
|
|||
rm -rf "$DESTDIR/usr/include"
|
||||
rm -rf "$DESTDIR/usr/lib"
|
||||
rm -rf "$DESTDIR/usr/share/man/man3"
|
||||
# Provided by util-linux-common
|
||||
rm -rf "$DESTDIR/usr/share/locale"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue