summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-12-03 13:17:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 12:37:02 +0000
commita72b52b405dd489f5e8bc0af2ea06e3002e4a079 (patch)
treecf1358ad2e36e02fea1ff27306ab988bc6764b44
parent367df47d374447c61f75b9aca436eaccf725aa5b (diff)
downloadpoky-a72b52b405dd489f5e8bc0af2ea06e3002e4a079.tar.gz
gobject-introspection: add a missing patch that was overlooked when adding meson support
This should also fix Rygel builds in meta-oe (From OE-Core rev: 8332fe551f018339b93841609625121145e97684) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch28
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch2
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch66
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb1
4 files changed, 82 insertions, 15 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
index 63b02fe0f3..80c9e71ad5 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
@@ -1,4 +1,4 @@
1From fabf8c505181636182a357e0c6e764b752ccf468 Mon Sep 17 00:00:00 2001 1From ea25a5a755bc839d5b504aac207f860ae68109bc Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 15 Nov 2018 15:10:05 +0100 3Date: Thu, 15 Nov 2018 15:10:05 +0100
4Subject: [PATCH] Port cross-compilation support to meson 4Subject: [PATCH] Port cross-compilation support to meson
@@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 3 files changed, 66 insertions(+), 17 deletions(-) 13 3 files changed, 66 insertions(+), 17 deletions(-)
14 14
15diff --git a/gir/meson.build b/gir/meson.build 15diff --git a/gir/meson.build b/gir/meson.build
16index 607bbc45..c0e221b3 100644 16index 1cb514a..f873068 100644
17--- a/gir/meson.build 17--- a/gir/meson.build
18+++ b/gir/meson.build 18+++ b/gir/meson.build
19@@ -37,15 +37,27 @@ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') 19@@ -36,15 +36,27 @@ gir_files = [
20 girdir = join_paths(get_option('datadir'), 'gir-1.0') 20 typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
21 install_data(gir_files, install_dir: girdir) 21 install_data(gir_files, install_dir: girdir)
22 22
23-scanner_command = [ 23-scanner_command = [
@@ -53,7 +53,7 @@ index 607bbc45..c0e221b3 100644
53 53
54 dep_type = glib_dep.type_name() 54 dep_type = glib_dep.type_name()
55 if dep_type == 'internal' 55 if dep_type == 'internal'
56@@ -58,6 +70,12 @@ if dep_type == 'internal' 56@@ -57,6 +69,12 @@ if dep_type == 'internal'
57 '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] 57 '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
58 endif 58 endif
59 59
@@ -66,7 +66,7 @@ index 607bbc45..c0e221b3 100644
66 # Take a glob and print to newlines 66 # Take a glob and print to newlines
67 globber = ''' 67 globber = '''
68 from glob import glob 68 from glob import glob
69@@ -84,8 +102,8 @@ glib_command = scanner_command + [ 69@@ -83,8 +101,8 @@ glib_command = scanner_command + [
70 70
71 if dep_type == 'pkgconfig' 71 if dep_type == 'pkgconfig'
72 glib_command += ['--external-library', '--pkg=glib-2.0'] 72 glib_command += ['--external-library', '--pkg=glib-2.0']
@@ -77,7 +77,7 @@ index 607bbc45..c0e221b3 100644
77 glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') 77 glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
78 glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') 78 glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
79 glib_files += join_paths(glib_libincdir, 'glibconfig.h') 79 glib_files += join_paths(glib_libincdir, 'glibconfig.h')
80@@ -339,7 +357,7 @@ endforeach 80@@ -338,7 +356,7 @@ endforeach
81 if giounix_dep.found() 81 if giounix_dep.found()
82 if dep_type == 'pkgconfig' 82 if dep_type == 'pkgconfig'
83 gio_command += ['--pkg=gio-unix-2.0'] 83 gio_command += ['--pkg=gio-unix-2.0']
@@ -86,7 +86,7 @@ index 607bbc45..c0e221b3 100644
86 # Get the installed gio-unix header list 86 # Get the installed gio-unix header list
87 ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) 87 ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
88 if ret.returncode() != 0 88 if ret.returncode() != 0
89@@ -417,15 +435,24 @@ gir_files += custom_target('gir-girepository', 89@@ -416,15 +434,24 @@ gir_files += custom_target('gir-girepository',
90 ] 90 ]
91 ) 91 )
92 92
@@ -116,10 +116,10 @@ index 607bbc45..c0e221b3 100644
116 install_dir: typelibdir, 116 install_dir: typelibdir,
117 ) 117 )
118diff --git a/meson.build b/meson.build 118diff --git a/meson.build b/meson.build
119index 7ec95328..9e20da57 100644 119index 17acd82..e0bb495 100644
120--- a/meson.build 120--- a/meson.build
121+++ b/meson.build 121+++ b/meson.build
122@@ -76,7 +76,9 @@ libffi_dep = dependency('libffi', 122@@ -81,7 +81,9 @@ libffi_dep = dependency('libffi',
123 subdir('girepository') 123 subdir('girepository')
124 subdir('tools') 124 subdir('tools')
125 subdir('giscanner') 125 subdir('giscanner')
@@ -131,12 +131,12 @@ index 7ec95328..9e20da57 100644
131 subdir('docs') 131 subdir('docs')
132 subdir('tests') 132 subdir('tests')
133diff --git a/meson_options.txt b/meson_options.txt 133diff --git a/meson_options.txt b/meson_options.txt
134index 49726be6..d557a3b6 100644 134index ee6958d..b168142 100644
135--- a/meson_options.txt 135--- a/meson_options.txt
136+++ b/meson_options.txt 136+++ b/meson_options.txt
137@@ -21,3 +21,23 @@ option('cairo-libname', type: 'string', 137@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
138 option('python', type: 'string', value: 'python3', 138 option('gir-dir-prefix', type: 'string',
139 description: 'Path or name of the Python interpreter to build for' 139 description: 'Intermediate prefix for gir installation under ${prefix}'
140 ) 140 )
141+ 141+
142+option('enable-host-gi', type: 'boolean', value : false, 142+option('enable-host-gi', type: 'boolean', value : false,
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 17b9eac057..fdcef3c714 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 @@
1From a20b4d70f44449875b7c54750ab0f02eefb0870d Mon Sep 17 00:00:00 2001 1From 2882e091e7b905441beef51dbed968f4dd7ffd7c Mon Sep 17 00:00:00 2001
2From: Sascha Silbe <x-yo17@se-silbe.de> 2From: Sascha Silbe <x-yo17@se-silbe.de>
3Date: Fri, 8 Jun 2018 13:55:10 +0200 3Date: Fri, 8 Jun 2018 13:55:10 +0200
4Subject: [PATCH] Relocate the repository directory for native builds 4Subject: [PATCH] Relocate the repository directory for native builds
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch
new file mode 100644
index 0000000000..8eec5f867e
--- /dev/null
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0010-meson-add-option-gir-dir-prefix.patch
@@ -0,0 +1,66 @@
1From bbc34f00fd30a13eafc607a956de60d822260355 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Fri, 14 Sep 2018 01:26:38 -0700
4Subject: [PATCH] meson: add option 'gir-dir-prefix'
5
6Add option 'gir-dir-prefix' for meson to make the installation path of
7.gir files could be configured which has been done for autoconf.
8
9Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3938b86f5289c2b28a5ec42965b8da4b509445c4]
10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11---
12 gir/meson.build | 1 -
13 meson.build | 8 +++++++-
14 meson_options.txt | 4 ++++
15 3 files changed, 11 insertions(+), 2 deletions(-)
16
17diff --git a/gir/meson.build b/gir/meson.build
18index 607bbc4..1cb514a 100644
19--- a/gir/meson.build
20+++ b/gir/meson.build
21@@ -34,7 +34,6 @@ gir_files = [
22 ]
23
24 typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
25-girdir = join_paths(get_option('datadir'), 'gir-1.0')
26 install_data(gir_files, install_dir: girdir)
27
28 scanner_command = [
29diff --git a/meson.build b/meson.build
30index a1432f7..17acd82 100644
31--- a/meson.build
32+++ b/meson.build
33@@ -18,7 +18,12 @@ python = pymod.find_installation(get_option('python'))
34 cc = meson.get_compiler('c')
35 config = configuration_data()
36 config.set_quoted('GIR_SUFFIX', 'gir-1.0')
37-config.set_quoted('GIR_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'gir-1.0'))
38+gir_dir_prefix = get_option('gir-dir-prefix')
39+if gir_dir_prefix == ''
40+ gir_dir_prefix = get_option('datadir')
41+endif
42+girdir = join_paths(get_option('prefix'), gir_dir_prefix, 'gir-1.0')
43+config.set_quoted('GIR_DIR', girdir)
44 config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
45
46 foreach type : ['char', 'short', 'int', 'long']
47@@ -93,6 +98,7 @@ pkgconfig_conf.set('libdir', join_paths('${prefix}', get_option('libdir')))
48 pkgconfig_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
49 pkgconfig_conf.set('datadir', '${datarootdir}')
50 pkgconfig_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))
51+pkgconfig_conf.set('GIR_DIR', join_paths('${prefix}', gir_dir_prefix, 'gir-1.0'))
52 if host_system == 'windows' or host_system == 'cygwin'
53 pkgconfig_conf.set('EXEEXT', '.exe')
54 else
55diff --git a/meson_options.txt b/meson_options.txt
56index 49726be..ee6958d 100644
57--- a/meson_options.txt
58+++ b/meson_options.txt
59@@ -21,3 +21,7 @@ option('cairo-libname', type: 'string',
60 option('python', type: 'string', value: 'python3',
61 description: 'Path or name of the Python interpreter to build for'
62 )
63+
64+option('gir-dir-prefix', type: 'string',
65+ description: 'Intermediate prefix for gir installation under ${prefix}'
66+)
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
index 66f9918538..f4f41b61c0 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.1.bb
@@ -19,6 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
19 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ 19 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
20 file://0001-configure.ac-make-GIR_DIR-configurable.patch \ 20 file://0001-configure.ac-make-GIR_DIR-configurable.patch \
21 file://0002-g-ir-tools-respect-gir_dir_prefix.patch \ 21 file://0002-g-ir-tools-respect-gir_dir_prefix.patch \
22 file://0010-meson-add-option-gir-dir-prefix.patch \
22 file://0001-Port-cross-compilation-support-to-meson.patch \ 23 file://0001-Port-cross-compilation-support-to-meson.patch \
23 " 24 "
24 25