diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2020-08-10 22:24:10 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-08-11 15:58:26 -0700 |
| commit | 87ce97805e48d0a0f0321c117545caf80458c3ec (patch) | |
| tree | 852e568e64cc49bb0265b8ee7a771ebaa3a9e979 /meta-oe/recipes-gnome/libpeas | |
| parent | 3b2c058ca988fcbf643567cf75082ca374ded1b4 (diff) | |
| download | meta-openembedded-87ce97805e48d0a0f0321c117545caf80458c3ec.tar.gz | |
libpeas: disable tests when introspection is not enabled/available
This fixes introspection-less build. Sent upstream so hope they either
agree or come up with something better next release.
Tested before and after adding the patch by setting GI_DATA_ENABLED = 'False'
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-gnome/libpeas')
| -rw-r--r-- | meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb | 5 |
2 files changed, 37 insertions, 4 deletions
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch new file mode 100644 index 0000000000..86586fe710 --- /dev/null +++ b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From 53a4f19887d9ae4e77f32dd6d71c8a7b516b4d5d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
| 3 | Date: Mon, 10 Aug 2020 21:53:33 +0200 | ||
| 4 | Subject: [PATCH] Do not build tests when introspection is disabled/missing | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Fixes: | ||
| 10 | | ../libpeas-1.26.0/tests/libpeas/introspection/meson.build:47:0: ERROR: Unknown variable "libpeas_gir". | ||
| 11 | |||
| 12 | Upstrem-Status: Submitted[https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/28] | ||
| 13 | |||
| 14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
| 15 | --- | ||
| 16 | meson.build | 4 +++- | ||
| 17 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/meson.build b/meson.build | ||
| 20 | index 8322fea..43fb062 100644 | ||
| 21 | --- a/meson.build | ||
| 22 | +++ b/meson.build | ||
| 23 | @@ -254,7 +254,9 @@ subdir('loaders') | ||
| 24 | if build_demos == true | ||
| 25 | subdir('peas-demo') | ||
| 26 | endif | ||
| 27 | -subdir('tests') | ||
| 28 | +if generate_gir == true | ||
| 29 | + subdir('tests') | ||
| 30 | +endif | ||
| 31 | |||
| 32 | summary = [ | ||
| 33 | '', | ||
| 34 | -- | ||
| 35 | 2.26.2 | ||
| 36 | |||
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb index 1b754343a1..fd4ce7de5e 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb | |||
| @@ -10,14 +10,11 @@ GTKDOC_MESON_OPTION = "gtk_doc" | |||
| 10 | 10 | ||
| 11 | inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check | 11 | inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check |
| 12 | 12 | ||
| 13 | # gobject-introspection is mandatory and cannot be configured | ||
| 14 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | ||
| 15 | UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" | ||
| 16 | |||
| 17 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 18 | 14 | ||
| 19 | SRC_URI += " \ | 15 | SRC_URI += " \ |
| 20 | file://add_missing_locale_include.patch \ | 16 | file://add_missing_locale_include.patch \ |
| 17 | file://0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch \ | ||
| 21 | " | 18 | " |
| 22 | 19 | ||
| 23 | SRC_URI[archive.md5sum] = "f7723bf8433b7984121157e1e9a629b5" | 20 | SRC_URI[archive.md5sum] = "f7723bf8433b7984121157e1e9a629b5" |
