cross/systemd-boot-x86: Upgrade to 261.1

ref: e4b96a41ae

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8930>
This commit is contained in:
Aelin 2026-06-29 18:05:21 +02:00 committed by The Friendly Meow (merge) Bot
parent a809c15c83
commit 69aa6cf2bd
No known key found for this signature in database
2 changed files with 30 additions and 26 deletions

View file

@ -1,33 +1,37 @@
From abcc28985f5ab3b50c3ed85abee5e7f8bbd0889e Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Sun, 21 Dec 2025 17:04:26 +0100
Subject: [PATCH] meson: disable libintl check if pam is disabled
Subject: [PATCH] meson: disable libintl/libucontext check if pam is disabled
Disable the libintl check when building without the pam feature, so e.g.
systemd-boot can be (cross) compiled without having the foreign arch
libintl installed on a musl platform.
Disable the libintl and libucontext checks when building without the pam
feature, so e.g. systemd-boot can be (cross) compiled without having the
foreign arch libintl and libucontext installed on a musl platform.
---
meson.build | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index bcf1ff2df5..c7088f3d9c 100644
index ff11c0c10c..0a667420aa 100644
--- a/meson.build
+++ b/meson.build
@@ -1021,11 +1021,10 @@ libdl = cc.find_library('dl')
# On some distributions that use musl (e.g. Alpine), libintl.h may be provided by gettext rather than musl.
# In that case, we need to explicitly link with libintl.so.
-if cc.has_function('dgettext',
+libintl = []
+if get_option('pam').enabled() and not cc.has_function('dgettext',
prefix : '''#include <libintl.h>''',
args : '-D_GNU_SOURCE')
- libintl = []
-else
libintl = cc.find_library('intl')
if not cc.has_function('dgettext',
prefix : '''#include <libintl.h>''',
--
2.52.0
@@ -1011,7 +1011,7 @@ libm = cc.find_library('m')
# Header presence check only — dgettext itself is resolved via dlopen_libintl() at runtime, so we never
# link against libintl. On glibc dgettext lives in libc; on musl gettext-dev provides libintl.h alongside
# libintl.so.8 which we dlopen() if present.
-if not cc.has_header('libintl.h')
+if get_option('pam').enabled() and not cc.has_header('libintl.h')
error('libintl.h not found (install gettext / gettext-dev)')
endif
@@ -1041,7 +1041,7 @@ conf.set10('HAVE_LIBCRYPT', have)
# musl declares the ucontext.h functions but does not implement them; the fiber bootstrap in
# src/libsystemd/sd-future/fiber.c relies on them, so on musl we have to link to libucontext.
-if get_option('libc') == 'musl'
+if get_option('pam').enabled() and get_option('libc') == 'musl'
libucontext = dependency('libucontext')
else
libucontext = []
--
2.54.0

View file

@ -2,7 +2,7 @@
maintainer=""
pkgname=systemd-boot-x86
_pkgname=systemd-boot # for monitoring
pkgver=260.2
pkgver=261.1
pkgrel=0
pkgdesc="systemd's EFI boot manager for x86 EFI on x86_64."
url="https://systemd.io/"
@ -118,7 +118,7 @@ efistub() {
}
sha512sums="
63d15da49e7580952a48a0b50df20c1b398e4b77edf259510b0cdb9022e919387baadf2190194a50f1f582b83e0768c13997a4189cf0fb6a61b65015496d9c80 systemd-260.2.tar.gz
8ecb5e25c0d8b01c406fa3084b0910d517cabbf12894958b4d3d77462cb0924f0a52fe2bf1aa39af29b16fd78fe080a6a99daa18015c6059fb2e52c971d83ba9 0001-meson-disable-libintl-check-if-pam-is-disabled.patch
5dbf8b902fbed6e719367266da658b46ed55e76c93b7aa48ebaf9daca36cb19261ebd45cb97139c51227022a8ca3d07da360953bd9b0aebb429dce6d111f7e5c systemd-261.1.tar.gz
e738b18e8cc92151f5888ea956b4ccc000278b84ea37713e5b046ed2233b9a7179eb1be97932f8aad943cc3edc2b208cb3995d52e7d3af050536f8983fd73b59 0001-meson-disable-libintl-check-if-pam-is-disabled.patch
ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132 cross-x86.meson
"