mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

gjs: Fix build failures with meson 0.60.2

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2021-12-10 09:35:17 -08:00
parent 53343ec728
commit c5e327605a
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gjs/gjs/0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch
+79
View File
@@ -0,0 +1,79 @@
From 4c8c84941146715d9c7077e8c5625490332d8bc5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 10 Dec 2021 09:32:17 -0800
Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2
Fixes
../gjs-1.70.0/meson.build:564:0: ERROR: "install_dir" must be specified when installing a target
see meson bug
https://github.com/mesonbuild/meson/issues/9472
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
installed-tests/js/libgjstesttools/meson.build | 2 +-
installed-tests/js/meson.build | 6 +++---
meson.build | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build
index 2e57483..3ca4d7e 100644
--- a/installed-tests/js/libgjstesttools/meson.build
+++ b/installed-tests/js/libgjstesttools/meson.build
@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools,
includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources,
namespace: 'GjsTestTools', nsversion: '1.0',
symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error',
- install: get_option('installed_tests'), install_dir_gir: false,
+ install: get_option('installed_tests'), install_dir_gir: [false],
install_dir_typelib: installed_tests_execdir)
gjstest_tools_typelib = gjstest_tools_gir[1]
libgjstesttools_dep = declare_dependency(
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index b42f3b2..1085e2f 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
identifier_prefix: 'Regress', symbol_prefix: 'regress_',
extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
- install: get_option('installed_tests'), install_dir_gir: false,
+ install: get_option('installed_tests'), install_dir_gir: [false],
install_dir_typelib: installed_tests_execdir)
regress_typelib = regress_gir[1]
@@ -91,7 +91,7 @@ if not skip_warnlib
warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
symbol_prefix: 'warnlib_', header: 'warnlib.h',
- install: get_option('installed_tests'), install_dir_gir: false,
+ install: get_option('installed_tests'), install_dir_gir: [false],
install_dir_typelib: installed_tests_execdir)
warnlib_typelib = warnlib_gir[1]
endif
@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
namespace: 'GIMarshallingTests', nsversion: '1.0',
symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
- install: get_option('installed_tests'), install_dir_gir: false,
+ install: get_option('installed_tests'), install_dir_gir: [false],
install_dir_typelib: installed_tests_execdir)
gimarshallingtests_typelib = gimarshallingtests_gir[1]
diff --git a/meson.build b/meson.build
index 192b1b5..076656d 100644
--- a/meson.build
+++ b/meson.build
@@ -565,7 +565,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
+ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
gjs_private_typelib = gjs_private_gir[1]
### Build gjs-console interpreter ##############################################
--
2.34.1
meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb
+1
View File
@@ -12,6 +12,7 @@ SRC_URI[archive.sha256sum] = "4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b04
SRC_URI += " \
file://0001-Support-cross-builds-a-bit-better.patch \
file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
file://0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch \
"
# gobject-introspection is mandatory and cannot be configured