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/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.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/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch index 03ef2b0059..e4fffcf613 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a28cc8413b68bec5b4cf2ee5f37b40a8965490a5 Mon Sep 17 00:00:00 2001 | 1 | From 2335d22e4c64db3d5dfc16ac65468b9dd66db8ac Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 19 Oct 2015 18:29:21 +0300 | 3 | Date: Mon, 19 Oct 2015 18:29:21 +0300 |
4 | Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper | 4 | Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper |
@@ -34,7 +34,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
34 | 4 files changed, 87 insertions(+), 1 deletion(-) | 34 | 4 files changed, 87 insertions(+), 1 deletion(-) |
35 | 35 | ||
36 | diff --git a/Makefile.am b/Makefile.am | 36 | diff --git a/Makefile.am b/Makefile.am |
37 | index 44ed115..2a1fa56 100644 | 37 | index 952bf71..797a3bd 100644 |
38 | --- a/Makefile.am | 38 | --- a/Makefile.am |
39 | +++ b/Makefile.am | 39 | +++ b/Makefile.am |
40 | @@ -21,7 +21,9 @@ include Makefile-cmph.am | 40 | @@ -21,7 +21,9 @@ include Makefile-cmph.am |
@@ -48,7 +48,7 @@ index 44ed115..2a1fa56 100644 | |||
48 | 48 | ||
49 | ## Process this file with automake to produce Makefile.in | 49 | ## Process this file with automake to produce Makefile.in |
50 | diff --git a/common.mk b/common.mk | 50 | diff --git a/common.mk b/common.mk |
51 | index e26c637..9f3a65f 100644 | 51 | index 77e819d..379ab53 100644 |
52 | --- a/common.mk | 52 | --- a/common.mk |
53 | +++ b/common.mk | 53 | +++ b/common.mk |
54 | @@ -6,6 +6,15 @@ | 54 | @@ -6,6 +6,15 @@ |
@@ -132,10 +132,10 @@ index e26c637..9f3a65f 100644 | |||
132 | INTROSPECTION_DOCTOOL_ARGS = \ | 132 | INTROSPECTION_DOCTOOL_ARGS = \ |
133 | --add-include-path=$(srcdir) \ | 133 | --add-include-path=$(srcdir) \ |
134 | diff --git a/configure.ac b/configure.ac | 134 | diff --git a/configure.ac b/configure.ac |
135 | index d48e6c3..ed5f8a2 100644 | 135 | index 885da70..cd8108b 100644 |
136 | --- a/configure.ac | 136 | --- a/configure.ac |
137 | +++ b/configure.ac | 137 | +++ b/configure.ac |
138 | @@ -367,6 +367,48 @@ dnl | 138 | @@ -383,6 +383,48 @@ dnl |
139 | AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) | 139 | AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) |
140 | AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) | 140 | AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) |
141 | 141 | ||