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 <redacted>
Signed-off-by: Christian Marangi <redacted>

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index a24a2f3450122678d6a73e83da397b102c7b6277..225fe07754a70b8b49cad92490775a0bef1c411d 100644 (file)
--- 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