util-linux-32: 2.40 -> 2.40.1

This commit is contained in:
Tim Biermann 2024-05-09 23:30:49 +02:00
parent 494b9a0f05
commit 2c3d5e0b85
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 8 additions and 26 deletions

View File

@ -7,9 +7,6 @@ lrwxrwxrwx root/root usr/lib32/libblkid.so.1 -> libblkid.so.1.1.0
lrwxrwxrwx root/root usr/lib32/libfdisk.so -> libfdisk.so.1
lrwxrwxrwx root/root usr/lib32/libfdisk.so.1 -> libfdisk.so.1.1.0
-rwxr-xr-x root/root usr/lib32/libfdisk.so.1.1.0
lrwxrwxrwx root/root usr/lib32/libmount.so -> libmount.so.1
lrwxrwxrwx root/root usr/lib32/libmount.so.1 -> libmount.so.1.1.0
-rwxr-xr-x root/root usr/lib32/libmount.so.1.1.0
-rw-r--r-- root/root usr/lib32/libsmartcols.a
lrwxrwxrwx root/root usr/lib32/libsmartcols.so -> libsmartcols.so.1
lrwxrwxrwx root/root usr/lib32/libsmartcols.so.1 -> libsmartcols.so.1.1.0
@ -21,6 +18,5 @@ lrwxrwxrwx root/root usr/lib32/libuuid.so.1 -> libuuid.so.1.3.0
drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/blkid.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/fdisk.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/mount.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/smartcols.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/uuid.pc

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXbSMZe4M8cCkMYwm8E4GpNyLbRK63URoyZ3acC/C3yEWNT2gZ4rVmewQnw2biogT4oh8empYOhy617uWsXIK5g0=
SHA256 (Pkgfile) = 143a322efd246c4f7a41734714827bbd3fbb8f0a1a91ff340bc4d3ac969552d5
SHA256 (.footprint) = b64ef9df9c7010cb060ac425cadbf7c953f8b1c80dd33970f35950559f7562eb
SHA256 (util-linux-2.40.tar.gz) = f7ff8573289313e38ee3378cbc2938f34444a8cb546e1236e46151834be69784
SHA256 (syscalls.patch) = 6ae6fbcbf892f50d4ab2e7c63a117750db21e495ab4ae20a447894bef7d5e0ad
RWSwxGo/zH7eXU21Rpr+TFk3kIqlVEnVRND8TQFnM4NKiLzQceWvrBBIwFNY+qI+JDCi8kPHzpMWpjZGhvu9fIgcaM9Vlu2qYwY=
SHA256 (Pkgfile) = 075e97d5202e901aabc66bb9572e14e711c50876a4b3c8358c52f42e5c69c458
SHA256 (.footprint) = ca75f161a257263ad97cb39d5141f6a4b3cd05eebac5b15cb0e8c2c6c4367051
SHA256 (util-linux-2.40.1.tar.xz) = 59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f

View File

@ -4,14 +4,11 @@
# Depends on: bzip2-32 eudev-32 sqlite3-32 xz-32 zlib-32
name=util-linux-32
version=2.40
version=2.40.1
release=1
source=(https://github.com/util-linux/util-linux/archive/v$version/util-linux-$version.tar.gz
syscalls.patch)
source=(https://www.kernel.org/pub/linux/utils/util-linux/v${version:0:4}/util-linux-$version.tar.xz)
build() {
patch -Np1 -d util-linux-$version -i $SRC/syscalls.patch
meson setup util-linux-$version build \
--prefix=/usr \
--bindir=/usr/bin \
@ -25,9 +22,10 @@ build() {
-D b_pie=true \
-D build-libblkid=enabled \
-D build-libuuid=enabled \
-D build-libmount=enabled \
-D build-libmount=disabled \
-D build-libsmartcols=enabled \
-D build-libfdisk=enabled \
-D build-python=disabled \
-D nls=disabled
meson compile -C build -j ${JOBS:-1}
DESTDIR=$PKG meson install -C build

View File

@ -1,11 +0,0 @@
--- a/meson.build
+++ b/meson.build
@@ -3026,7 +3026,7 @@ endif
syscalls_h = custom_target('syscalls.h',
input : 'tools/all_syscalls',
output : 'syscalls.h',
- command : ['tools/all_syscalls', cc.cmd_array()]
+ command : ['tools/all_syscalls', cc.cmd_array(), get_option('c_args')],
)
if cc.compiles(fs.read('include/audit-arch.h'), name : 'has AUDIT_ARCH_NATIVE')