diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:10:02 +0100 |
commit | 37a210e084092317375413c58bdb8d6e106512e0 (patch) | |
tree | 45a02b8747813abacf10acd7abafa0a1760cfd50 /meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | |
parent | 87f32804db4dc6bbde95bec3064dd7cde342dbb1 (diff) | |
download | poky-37a210e084092317375413c58bdb8d6e106512e0.tar.gz |
gobject-introspection: update to 1.60.1
Drop upstreamed patches:
0010-meson-add-option-gir-dir-prefix.patch
0002-g-ir-tools-respect-gir_dir_prefix.patch
0001-configure.ac-make-GIR_DIR-configurable.patch
Rebase the rest.
Upstream has renamed the gir_dir_prefix option, adjust the recipe.
Add a patch to disable tests in cross builds, as previously meson
build system didn't actually build them.
(From OE-Core rev: 98f4c3a64f8a2b03f57df4387d2ce1e3b3af4035)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch index a91d22afa7..a4f45a142d 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7ea8c83d84a05f686128e652a5447fb5f6fb68be Mon Sep 17 00:00:00 2001 | 1 | From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001 |
2 | From: Sascha Silbe <x-yo17@se-silbe.de> | 2 | From: Sascha Silbe <x-yo17@se-silbe.de> |
3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 | 3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 |
4 | Subject: [PATCH] Relocate the repository directory for native builds | 4 | Subject: [PATCH] Relocate the repository directory for native builds |
@@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> | |||
21 | 2 files changed, 14 insertions(+), 3 deletions(-) | 21 | 2 files changed, 14 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/girepository/girepository.c b/girepository/girepository.c | 23 | diff --git a/girepository/girepository.c b/girepository/girepository.c |
24 | index c1fa3d3..efa557e 100644 | 24 | index ca5dc2b..7a4d17f 100644 |
25 | --- a/girepository/girepository.c | 25 | --- a/girepository/girepository.c |
26 | +++ b/girepository/girepository.c | 26 | +++ b/girepository/girepository.c |
27 | @@ -21,6 +21,8 @@ | 27 | @@ -21,6 +21,8 @@ |
@@ -42,7 +42,7 @@ index c1fa3d3..efa557e 100644 | |||
42 | /** | 42 | /** |
43 | * SECTION:girepository | 43 | * SECTION:girepository |
44 | * @short_description: GObject Introspection repository manager | 44 | * @short_description: GObject Introspection repository manager |
45 | @@ -188,9 +192,16 @@ init_globals (void) | 45 | @@ -212,9 +216,16 @@ init_globals (void) |
46 | g_free (custom_dirs); | 46 | g_free (custom_dirs); |
47 | } | 47 | } |
48 | 48 | ||
@@ -62,12 +62,12 @@ index c1fa3d3..efa557e 100644 | |||
62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); | 62 | typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); |
63 | 63 | ||
64 | diff --git a/girepository/meson.build b/girepository/meson.build | 64 | diff --git a/girepository/meson.build b/girepository/meson.build |
65 | index 6a8c5b5..8892f2a 100644 | 65 | index 0261e1a..4cb646f 100644 |
66 | --- a/girepository/meson.build | 66 | --- a/girepository/meson.build |
67 | +++ b/girepository/meson.build | 67 | +++ b/girepository/meson.build |
68 | @@ -27,7 +27,7 @@ girepo_internals_lib = static_library('girepository-internals', | 68 | @@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals', |
69 | ], | 69 | ], |
70 | c_args: gi_hidden_visibility_cflags, | 70 | c_args: gi_hidden_visibility_cflags + custom_c_args, |
71 | include_directories : configinc, | 71 | include_directories : configinc, |
72 | - dependencies: [girepo_gthash_dep, libffi_dep], | 72 | - dependencies: [girepo_gthash_dep, libffi_dep], |
73 | + dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')], | 73 | + dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')], |