| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From 85f7b74fc602214297928afe09347c31d696173d Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 15 Feb 2019 14:21:06 +0100 |
| 4 | Subject: [PATCH] Do not enforce no-introspection when cross-building |
| 5 | |
| Brad Bishop | 1d80a2e | 2019-11-15 16:35:03 -0500 | [diff] [blame^] | 6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/commit/7ef5ec60c33e254bcd915936bea3f04ba0fe2273] |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 8 | Signed-off-by: Alistair Francis <alistair@alistair23.me> |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 9 | --- |
| 10 | meson.build | 2 +- |
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 12 | |
| 13 | diff --git a/meson.build b/meson.build |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 14 | index 25887f9..6261a7c 100644 |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 15 | --- a/meson.build |
| 16 | +++ b/meson.build |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 17 | @@ -281,7 +281,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows' |
| 18 | # FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+ |
| 19 | # the we can enable the introspection even for the static build. See |
| 20 | # https://github.com/mesonbuild/meson/pull/4478. |
| 21 | -enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() and not is_static_library |
| 22 | +enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 23 | |
| 24 | ############ |
| 25 | # Vala API # |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 26 | -- |
| 27 | 2.20.1 |
| 28 | |