From 1c973fff92a6c00bc500db2be0ff67bb4f0ae125 Mon Sep 17 00:00:00 2001 From: Lu Dai Date: Sat, 7 Feb 2026 02:06:11 +0100 Subject: [PATCH] glib2: fix builds by explicitly disabling libelf The libelf Meson option defaults to auto. Since commit 71b7b4478906 ("glib2: do not set default meson options"), glib2 can enable libelf support nondeterministically depending on whether libelf.pc is visible during configure. On failing builders Meson reports: Run-time dependency libelf found: YES 0.192 and gresource later fails with: ../gio/gresource-tool.c:34:10: fatal error: libelf.h: No such file or directory On passing builders we see: Run-time dependency libelf found: NO (tried pkgconfig and cmake) So explicitly disable libelf again to restore deterministic builds. Fixes: #23459 Fixes: 71b7b4478906 ("glib2: do not set default meson options") Signed-off-by: Lu Dai Signed-off-by: Christian Marangi --- libs/glib2/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index a24a2f3450..225fe07754 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 PKG_VERSION:=2.82.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION)) @@ -68,6 +68,9 @@ COMP_ARGS+=-Dintrospection=disabled # set runtime dir to /var/run COMP_ARGS+=-Druntime_dir=/var/run +# default feature=auto see meson_options.txt +COMP_ARGS+=-Dlibelf=disabled + MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Dnls=disabled MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled