[gitg/gnome-3-30] build: Fix shared library paths in typelib files
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/gnome-3-30] build: Fix shared library paths in typelib files
- Date: Sat, 27 Oct 2018 22:17:14 +0000 (UTC)
commit 95b0879b975d490114adae01ef91532dbba01d5b
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Sat Oct 27 15:32:23 2018 +0200
build: Fix shared library paths in typelib files
The GObject Introspection metadata generation by meson uses a custom
target command[0]. This command also needs to specify the shared
library where the symbols in the typelib file can be found.
However, the values used are wrong because the path to the built
shared libraries are specified instead of the name of the
shared libraries themselves.
This has been fixed by specifying the name of the shared libraries.
Fixes #157
[0] http://mesonbuild.com/Vala.html#gobject-introspection
libgitg-ext/meson.build | 2 +-
libgitg/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build
index 784f36d3..5e347e01 100644
--- a/libgitg-ext/meson.build
+++ b/libgitg-ext/meson.build
@@ -114,7 +114,7 @@ endif
custom_target(
libgitg_ext_typelib_name,
output: libgitg_ext_typelib_name,
- command: [g_ir_compiler, '--shared-library', libgitg_ext.full_path(), '--includedir', libgitg_build_dir,
'--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_name)],
+ command: [g_ir_compiler, '--shared-library', libgitg_ext_api_name, '--includedir', libgitg_build_dir,
'--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_name)],
depends: [
libgitg,
libgitg_ext,
diff --git a/libgitg/meson.build b/libgitg/meson.build
index 1214f3fb..a3a78a0b 100644
--- a/libgitg/meson.build
+++ b/libgitg/meson.build
@@ -167,7 +167,7 @@ pkg.generate(
custom_target(
libgitg_typelib_name,
output: libgitg_typelib_name,
- command: [g_ir_compiler, '--shared-library', libgitg.full_path(), '--output', '@OUTPUT@',
join_paths(libgitg_build_dir, libgitg_gir_name)],
+ command: [g_ir_compiler, '--shared-library', libgitg_api_name, '--output', '@OUTPUT@',
join_paths(libgitg_build_dir, libgitg_gir_name)],
depends: libgitg,
install: true,
install_dir: gitg_girepositorydir,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]