diff options
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch | 28 |
1 files changed, 14 insertions, 14 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 @@ | |||
1 | From fabf8c505181636182a357e0c6e764b752ccf468 Mon Sep 17 00:00:00 2001 | 1 | From ea25a5a755bc839d5b504aac207f860ae68109bc 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: Thu, 15 Nov 2018 15:10:05 +0100 | 3 | Date: Thu, 15 Nov 2018 15:10:05 +0100 |
4 | Subject: [PATCH] Port cross-compilation support to meson | 4 | Subject: [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 | ||
15 | diff --git a/gir/meson.build b/gir/meson.build | 15 | diff --git a/gir/meson.build b/gir/meson.build |
16 | index 607bbc45..c0e221b3 100644 | 16 | index 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 | ) |
118 | diff --git a/meson.build b/meson.build | 118 | diff --git a/meson.build b/meson.build |
119 | index 7ec95328..9e20da57 100644 | 119 | index 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') |
133 | diff --git a/meson_options.txt b/meson_options.txt | 133 | diff --git a/meson_options.txt b/meson_options.txt |
134 | index 49726be6..d557a3b6 100644 | 134 | index 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, |