mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

gobject-introspection: relocate typelib repository for native builds

Browse Source 
gobject-introspection hard-codes the install path in the search path
for the typelib repository, pretty much the same way glib behaves for
the gio modules directory. Like for glib, this causes problems when
gobject-introspection-native is restored from sstate with a different
build directory.

Based on the glib fix by Ross Burton <ross.burton@intel.com>.

(From OE-Core rev: e4cee788056133ce0a49bc96e54399bdd7825aa3)

Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Sascha Silbe
2018-06-08 18:18:41 +02:00
committed by Richard Purdie
parent 261ee18968
commit 9a855aa403
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch Normal file
View File

@@ -0,0 +1,64 @@
From 31ef4cce83c1770ea1e816d91b7e258fbf170035 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <x-yo17@se-silbe.de>
Date: Fri, 8 Jun 2018 13:55:10 +0200
Subject: [PATCH] Relocate the repository directory for native builds
Instead of hard-coding GOBJECT_INTROSPECTION_LIBDIR when
gobject-introspection is built, use dladdr() to determine where
GOBJECT_INTROSPECTION_LIBDIR is and use that path to calculate the
repository directory.
This fixes gobject-introspection-native accessing paths across build
directories (e.g. if the build directories use the same shared state
cache or sstate mirror).
Upstream-Status: Inappropriate
Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de>
---
girepository/girepository.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/girepository/girepository.c b/girepository/girepository.c
index 10282c72..60c45104 100644
--- a/girepository/girepository.c
+++ b/girepository/girepository.c
@@ -21,6 +21,8 @@
* Boston, MA 02111-1307, USA.
*/
+#define _GNU_SOURCE
+
#include "config.h"
#include <stdio.h>
@@ -34,6 +36,8 @@
#include "gitypelib-internal.h"
#include "girepository-private.h"
+#include <dlfcn.h>
+
/**
* SECTION:girepository
* @short_description: GObject Introspection repository manager
@@ -191,9 +195,16 @@ init_globals (void)
g_free (custom_dirs);
}
- libdir = GOBJECT_INTROSPECTION_LIBDIR;
+ Dl_info gi_lib_info;
- typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
+ if (dladdr (g_irepository_get_default, &gi_lib_info)) {
+ char *libdir = g_path_get_dirname (gi_lib_info.dli_fname);
+ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
+ g_free (libdir);
+ } else {
+ libdir = GOBJECT_INTROSPECTION_LIBDIR;
+ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
+ }
search_path = g_slist_prepend (search_path, typelib_dir);
--
2.11.0

2
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.56.1.bb
View File

@@ -20,6 +20,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
SRC_URI[md5sum] = "62e5f5685b8d9752fdeaf17c057d53d1"
SRC_URI[sha256sum] = "5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b"
SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch "
inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even
BBCLASSEXTEND = "native"