Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
lib32-util-linux
Commits:
9e6f38ae by Christian Hesse at 2024-05-06T22:47:54+02:00
upgpkg: 2.40.1-1: new upstream release
- - - - -
3 changed files:
- .SRCINFO
- + 0001-fix-build.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = lib32-util-linux
pkgdesc = Miscellaneous system utilities for Linux (32-bit)
- pkgver = 2.40
- pkgrel = 2
+ pkgver = 2.40.1
+ pkgrel = 1
url = https://github.com/util-linux/util-linux
arch = x86_64
license = GPL2
@@ -9,7 +9,7 @@ pkgbase = lib32-util-linux
makedepends = meson
makedepends = lib32-libxcrypt
makedepends = lib32-ncurses
- depends = util-linux-libs=2.40
+ depends = util-linux-libs=2.40.1
depends = lib32-glibc
provides = libuuid.so
provides = libblkid.so
@@ -17,8 +17,10 @@ pkgbase = lib32-util-linux
provides = libmount.so
provides = libsmartcols.so
options = !emptydirs
- source = git+https://github.com/util-linux/util-linux#tag=v2.40?signed
+ source = git+https://github.com/util-linux/util-linux#tag=v2.40.1?signed
+ source = 0001-fix-build.patch
validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
- sha256sums =
153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d
+ sha256sums =
c08ac20cf4fb061a0aa0d318a245b269acdfd14f7abf1f272476358878e6862a
+ sha256sums =
07b42d50b8450ecd1ef7e939d579d20526388036926e33a2927818e24a8e180c
pkgname = lib32-util-linux
=====================================
0001-fix-build.patch
=====================================
@@ -0,0 +1,14 @@
+diff --git a/libmount/python/meson.build b/libmount/python/meson.build
+index 72985eca6..7e1703063 100644
+--- a/libmount/python/meson.build
++++ b/libmount/python/meson.build
+@@ -1,3 +1,9 @@
++python_module = import('python')
++
++python = python_module.find_installation(
++ get_option('python'),
++ required : get_option('build-python'),
++ disabler : true)
+ build_python = python.found()
+
+ pylibmount_sources = '''
=====================================
PKGBUILD
=====================================
@@ -3,9 +3,9 @@
_pkgbasename=util-linux
pkgname=lib32-${_pkgbasename}
-_tag='2.40'
+_tag='2.40.1'
pkgver="${_tag/-/}"
-pkgrel=2
+pkgrel=1
pkgdesc='Miscellaneous system utilities for Linux (32-bit)'
url='https://github.com/util-linux/util-linux'
arch=('x86_64')
@@ -15,8 +15,10 @@ provides=('libuuid.so' 'libblkid.so' 'libfdisk.so'
'libmount.so' 'libsmartcols.s
license=('GPL2')
options=('!emptydirs')
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
-source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed";)
-sha256sums=('153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d')
+source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed";
+ '0001-fix-build.patch')
+sha256sums=('c08ac20cf4fb061a0aa0d318a245b269acdfd14f7abf1f272476358878e6862a'
+ '07b42d50b8450ecd1ef7e939d579d20526388036926e33a2927818e24a8e180c')
_backports=(
)
@@ -39,6 +41,11 @@ prepare() {
git revert --mainline 1 --no-commit "${_c}"
done
+ # Currently multilib build is broken in stable/v2.40 (and probably master as
well)...
+ # This code is required, so add it back.
+ # https://github.com/util-linux/util-linux/issues/3014
+ patch -Np1 < ../0001-fix-build.patch
+
# do not mark dirty
sed -i '/dirty=/c dirty=' tools/git-version-gen
}
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-util-linux/-/commit/9e6f38ae0fad5dbbf0ade158ada45591251db55e
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-util-linux/-/commit/9e6f38ae0fad5dbbf0ade158ada45591251db55e
You're receiving this email because of your account on gitlab.archlinux.org.
