diff mbox series

[mickledore,10/20] glib-2.0: libelf has a configure option now, specify it

Message ID c5bece42d8e10554a6061872ca0f8f70d7102a79.1696982312.git.steve@sakoman.com
State New
Headers show
Series [mickledore,01/20] gstreamer: upgrade 1.22.5 -> 1.22.6 | expand

Commit Message

Steve Sakoman Oct. 11, 2023, 12:01 a.m. UTC 
From: Ross Burton <ross.burton@arm.com>

GLib has had an option to control libelf since 2.67.0, so use it.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d2f028c53a2390c28685b373841c9a600e91819a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 843b6bd29b..878dd107de 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -40,8 +40,7 @@  PACKAGECONFIG ??= "libmount \
                    ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux"
 PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
-# libelf is auto-detected without a configuration option
-PACKAGECONFIG[libelf] = ",,elfutils"
+PACKAGECONFIG[libelf] = "-Dlibelf=enabled,-Dlibelf=disabled,elfutils"
 PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,"
 PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux"