aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-04-30 08:47:21 +0200
committerKhem Raj <raj.khem@gmail.com>2024-04-30 11:00:34 -0700
commit63db9c0d52b08c08d7d5b4aa22d1bafdc2c9b037 (patch)
tree99b52c9b04305f787583d3b17141469e1606bd73
parentd8ba3e4400447eac0b83ba46f295c3af1423fca4 (diff)
downloadmeta-openembedded-contrib-63db9c0d52b08c08d7d5b4aa22d1bafdc2c9b037.tar.gz
networkmanager: fix gir build
Basically what is done in: https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=4c40897893f43a99e6ae12e652c0cf789d89df90 This fixes: | gi.RepositoryError: Typelib file for namespace 'Gobject', version '2.0' not found | gi.RepositoryError: Typelib file for namespace 'Gio', version '2.0' not found | gi.RepositoryError: Typelib file for namespace 'GModule', version '2.0' not found - Remove uneeded do_compile:prepend. It was broken because of {B}} and seems to be unneeded anyway Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb
index be30154a36..8184fcf1a1 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb
@@ -76,9 +76,10 @@ EXTRA_OEMESON = "\
CFLAGS:append:libc-musl = " \
-DRTLD_DEEPBIND=0 \
"
-
-do_compile:prepend() {
- export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+do_configure:prepend() {
+ cp -f ${STAGING_LIBDIR}/girepository-1.0/GObject*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
+ cp -f ${STAGING_LIBDIR}/girepository-1.0/Gio*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
+ cp -f ${STAGING_LIBDIR}/girepository-1.0/GModule*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
}
PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \