FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gobject-introspection: Fix introspection failing on Linux with subproject GLib

Browse Source 
This is caused by RPATHs missing when glib, gobject, or gio are supplied by
uninstalled pkg-config modules (as opposed to directly in the command line).

Fixes #4561

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9509>
This commit is contained in:
L. E. Segovia 2025-08-07 21:04:58 -03:00 committed by GStreamer Marge Bot
parent 3f1e8835b8
commit 265b488093
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/gobject-introspection.wrap
View File

@ -5,7 +5,7 @@ source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/gobject-introspec
source_filename = gobject-introspection-1.84.0.tar.xz
source_hash = 945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794a84779
wrapdb_version = 1.84.0-0
diff_files = gobject-introspection-1.84.0/0003-girepository-Load-typelibs-from-a-relocatable-prefix.patch, gobject-introspection-1.84.0/0004-build-Fix-b_vscrt-value-use-without-converting-it-to.patch, gobject-introspection-1.84.0/0006-tests-Fix-path-parsing-for-Windows.patch, gobject-introspection-1.84.0/0007-g-ir-tools-Support-reading-rspfiles-for-arguments.patch, gobject-introspection-1.84.0/0008-meson-Fix-fs.copyfile-semantics-breaking-GIR-build-w.patch, gobject-introspection-1.84.0/0009-giscanner-Deduplicate-arguments-and-use-response-fil.patch
diff_files = gobject-introspection-1.84.0/0003-girepository-Load-typelibs-from-a-relocatable-prefix.patch, gobject-introspection-1.84.0/0004-build-Fix-b_vscrt-value-use-without-converting-it-to.patch, gobject-introspection-1.84.0/0006-tests-Fix-path-parsing-for-Windows.patch, gobject-introspection-1.84.0/0007-g-ir-tools-Support-reading-rspfiles-for-arguments.patch, gobject-introspection-1.84.0/0008-meson-Fix-fs.copyfile-semantics-breaking-GIR-build-w.patch, gobject-introspection-1.84.0/0009-giscanner-Deduplicate-arguments-and-use-response-fil.patch, gobject-introspection-1.84.0/0010-dumper-Fix-introspection-binaries-missing-rpaths-for.patch
[provide]
dependency_names = gobject-introspection-1.0

37
subprojects/packagefiles/gobject-introspection-1.84.0/0010-dumper-Fix-introspection-binaries-missing-rpaths-for.patch Normal file
View File

@ -0,0 +1,37 @@
From 88629d7277139ec53e71bd54fce5e8ae8cc6fe99 Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amy@centricular.com>
Date: Thu, 7 Aug 2025 20:20:29 -0300
Subject: [PATCH] dumper: Fix introspection binaries missing rpaths for
uninstalled ELF shlibs
Same as 6ffb7c06a35c05661dce997af4dfd83e8b3e024d, in this case
dependencies that were resolved by pkg-config to uninstalled modules do
not entail adding RPATH entries. This will affect gio and gmodule by
default (see DumpCompiler.__init__), but also any dependency supplied with
--pkg.
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4561
---
giscanner/dumper.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 96bcd845..e5678637 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -253,9 +253,11 @@ class DumpCompiler(object):
args.extend(pkg_config_libs)
self._compiler.get_external_link_flags(args, self._options.libraries)
- if sys.platform == 'darwin':
+ if sys.platform in ('darwin', 'linux'):
# If the libraries' ID are of the form (@rpath/libfoo.dylib),
# then nothing previously can have added the needed rpaths
+ # For the linux case, covers when uninstalled libraries
+ # supplied transitive requirements
rpath_entries_to_add = [lib.replace('-L/', '-Wl,-rpath,/') for lib in pkg_config_libs if lib.startswith('-L/')]
args.extend(rpath_entries_to_add)
--
2.39.5 (Apple Git-154)