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 | 37 |
1 files changed, 20 insertions, 17 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 80c9e71ad5..5747d61c19 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 ea25a5a755bc839d5b504aac207f860ae68109bc Mon Sep 17 00:00:00 2001 | 1 | From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 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 |
@@ -7,16 +7,16 @@ Upstream-Status: Pending | |||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | 8 | ||
9 | --- | 9 | --- |
10 | gir/meson.build | 59 ++++++++++++++++++++++++++++++++++------------- | 10 | gir/meson.build | 62 ++++++++++++++++++++++++++++++++++------------- |
11 | meson.build | 4 +++- | 11 | meson.build | 4 ++- |
12 | meson_options.txt | 20 ++++++++++++++++ | 12 | meson_options.txt | 20 +++++++++++++++ |
13 | 3 files changed, 66 insertions(+), 17 deletions(-) | 13 | 3 files changed, 68 insertions(+), 18 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 1cb514a..f873068 100644 | 16 | index 85ae575..327c134 100644 |
17 | --- a/gir/meson.build | 17 | --- a/gir/meson.build |
18 | +++ b/gir/meson.build | 18 | +++ b/gir/meson.build |
19 | @@ -36,15 +36,27 @@ gir_files = [ | 19 | @@ -36,16 +36,29 @@ gir_files = [ |
20 | typelibdir = join_paths(get_option('libdir'), 'girepository-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 | ||
@@ -25,6 +25,7 @@ index 1cb514a..f873068 100644 | |||
25 | - girscanner, | 25 | - girscanner, |
26 | - '--output=@OUTPUT@', | 26 | - '--output=@OUTPUT@', |
27 | - '--no-libtool', | 27 | - '--no-libtool', |
28 | - '--quiet', | ||
28 | - '--reparse-validate', | 29 | - '--reparse-validate', |
29 | - '--add-include-path', join_paths(meson.current_build_dir()), | 30 | - '--add-include-path', join_paths(meson.current_build_dir()), |
30 | - '--add-include-path', join_paths(meson.current_source_dir()), | 31 | - '--add-include-path', join_paths(meson.current_source_dir()), |
@@ -34,6 +35,7 @@ index 1cb514a..f873068 100644 | |||
34 | + 'g-ir-scanner', | 35 | + 'g-ir-scanner', |
35 | + '--output=@OUTPUT@', | 36 | + '--output=@OUTPUT@', |
36 | + '--no-libtool', | 37 | + '--no-libtool', |
38 | + '--quiet', | ||
37 | + '--reparse-validate', | 39 | + '--reparse-validate', |
38 | + '--add-include-path', join_paths(meson.current_build_dir()), | 40 | + '--add-include-path', join_paths(meson.current_build_dir()), |
39 | + '--add-include-path', join_paths(meson.current_source_dir()), | 41 | + '--add-include-path', join_paths(meson.current_source_dir()), |
@@ -44,6 +46,7 @@ index 1cb514a..f873068 100644 | |||
44 | + girscanner, | 46 | + girscanner, |
45 | + '--output=@OUTPUT@', | 47 | + '--output=@OUTPUT@', |
46 | + '--no-libtool', | 48 | + '--no-libtool', |
49 | + '--quiet', | ||
47 | + '--reparse-validate', | 50 | + '--reparse-validate', |
48 | + '--add-include-path', join_paths(meson.current_build_dir()), | 51 | + '--add-include-path', join_paths(meson.current_build_dir()), |
49 | + '--add-include-path', join_paths(meson.current_source_dir()), | 52 | + '--add-include-path', join_paths(meson.current_source_dir()), |
@@ -53,7 +56,7 @@ index 1cb514a..f873068 100644 | |||
53 | 56 | ||
54 | dep_type = glib_dep.type_name() | 57 | dep_type = glib_dep.type_name() |
55 | if dep_type == 'internal' | 58 | if dep_type == 'internal' |
56 | @@ -57,6 +69,12 @@ if dep_type == 'internal' | 59 | @@ -58,6 +71,12 @@ if dep_type == 'internal' |
57 | '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] | 60 | '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] |
58 | endif | 61 | endif |
59 | 62 | ||
@@ -66,7 +69,7 @@ index 1cb514a..f873068 100644 | |||
66 | # Take a glob and print to newlines | 69 | # Take a glob and print to newlines |
67 | globber = ''' | 70 | globber = ''' |
68 | from glob import glob | 71 | from glob import glob |
69 | @@ -83,8 +101,8 @@ glib_command = scanner_command + [ | 72 | @@ -84,8 +103,8 @@ glib_command = scanner_command + [ |
70 | 73 | ||
71 | if dep_type == 'pkgconfig' | 74 | if dep_type == 'pkgconfig' |
72 | glib_command += ['--external-library', '--pkg=glib-2.0'] | 75 | glib_command += ['--external-library', '--pkg=glib-2.0'] |
@@ -77,7 +80,7 @@ index 1cb514a..f873068 100644 | |||
77 | glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') | 80 | glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') |
78 | glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') | 81 | glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') |
79 | glib_files += join_paths(glib_libincdir, 'glibconfig.h') | 82 | glib_files += join_paths(glib_libincdir, 'glibconfig.h') |
80 | @@ -338,7 +356,7 @@ endforeach | 83 | @@ -339,7 +358,7 @@ endforeach |
81 | if giounix_dep.found() | 84 | if giounix_dep.found() |
82 | if dep_type == 'pkgconfig' | 85 | if dep_type == 'pkgconfig' |
83 | gio_command += ['--pkg=gio-unix-2.0'] | 86 | gio_command += ['--pkg=gio-unix-2.0'] |
@@ -86,10 +89,10 @@ index 1cb514a..f873068 100644 | |||
86 | # Get the installed gio-unix header list | 89 | # Get the installed gio-unix header list |
87 | ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) | 90 | ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) |
88 | if ret.returncode() != 0 | 91 | if ret.returncode() != 0 |
89 | @@ -416,15 +434,24 @@ gir_files += custom_target('gir-girepository', | 92 | @@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository', |
90 | ] | ||
91 | ) | 93 | ) |
92 | 94 | ||
95 | typelibs = [] | ||
93 | +if get_option('enable-gi-cross-wrapper') != '' | 96 | +if get_option('enable-gi-cross-wrapper') != '' |
94 | + gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', | 97 | + gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', |
95 | + '--includedir', meson.current_build_dir(), | 98 | + '--includedir', meson.current_build_dir(), |
@@ -103,7 +106,7 @@ index 1cb514a..f873068 100644 | |||
103 | +endif | 106 | +endif |
104 | + | 107 | + |
105 | foreach gir : gir_files | 108 | foreach gir : gir_files |
106 | custom_target('generate-typelib-@0@'.format(gir).underscorify(), | 109 | typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), |
107 | input: gir, | 110 | input: gir, |
108 | output: '@BASENAME@.typelib', | 111 | output: '@BASENAME@.typelib', |
109 | depends: [gobject_gir, ], | 112 | depends: [gobject_gir, ], |
@@ -116,10 +119,10 @@ index 1cb514a..f873068 100644 | |||
116 | install_dir: typelibdir, | 119 | install_dir: typelibdir, |
117 | ) | 120 | ) |
118 | diff --git a/meson.build b/meson.build | 121 | diff --git a/meson.build b/meson.build |
119 | index 17acd82..e0bb495 100644 | 122 | index 95bbd2b..f7baefd 100644 |
120 | --- a/meson.build | 123 | --- a/meson.build |
121 | +++ b/meson.build | 124 | +++ b/meson.build |
122 | @@ -81,7 +81,9 @@ libffi_dep = dependency('libffi', | 125 | @@ -163,7 +163,9 @@ endif |
123 | subdir('girepository') | 126 | subdir('girepository') |
124 | subdir('tools') | 127 | subdir('tools') |
125 | subdir('giscanner') | 128 | subdir('giscanner') |
@@ -131,11 +134,11 @@ index 17acd82..e0bb495 100644 | |||
131 | subdir('docs') | 134 | subdir('docs') |
132 | subdir('tests') | 135 | subdir('tests') |
133 | diff --git a/meson_options.txt b/meson_options.txt | 136 | diff --git a/meson_options.txt b/meson_options.txt |
134 | index ee6958d..b168142 100644 | 137 | index 445a68a..a325511 100644 |
135 | --- a/meson_options.txt | 138 | --- a/meson_options.txt |
136 | +++ b/meson_options.txt | 139 | +++ b/meson_options.txt |
137 | @@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', | 140 | @@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', |
138 | option('gir-dir-prefix', type: 'string', | 141 | option('gir_dir_prefix', type: 'string', |
139 | description: 'Intermediate prefix for gir installation under ${prefix}' | 142 | description: 'Intermediate prefix for gir installation under ${prefix}' |
140 | ) | 143 | ) |
141 | + | 144 | + |