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 @@ -From ea25a5a755bc839d5b504aac207f860ae68109bc Mon Sep 17 00:00:00 2001 +From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 15 Nov 2018 15:10:05 +0100 Subject: [PATCH] Port cross-compilation support to meson @@ -7,16 +7,16 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - gir/meson.build | 59 ++++++++++++++++++++++++++++++++++------------- - meson.build | 4 +++- - meson_options.txt | 20 ++++++++++++++++ - 3 files changed, 66 insertions(+), 17 deletions(-) + gir/meson.build | 62 ++++++++++++++++++++++++++++++++++------------- + meson.build | 4 ++- + meson_options.txt | 20 +++++++++++++++ + 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/gir/meson.build b/gir/meson.build -index 1cb514a..f873068 100644 +index 85ae575..327c134 100644 --- a/gir/meson.build +++ b/gir/meson.build -@@ -36,15 +36,27 @@ gir_files = [ +@@ -36,16 +36,29 @@ gir_files = [ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') install_data(gir_files, install_dir: girdir) @@ -25,6 +25,7 @@ index 1cb514a..f873068 100644 - girscanner, - '--output=@OUTPUT@', - '--no-libtool', +- '--quiet', - '--reparse-validate', - '--add-include-path', join_paths(meson.current_build_dir()), - '--add-include-path', join_paths(meson.current_source_dir()), @@ -34,6 +35,7 @@ index 1cb514a..f873068 100644 + 'g-ir-scanner', + '--output=@OUTPUT@', + '--no-libtool', ++ '--quiet', + '--reparse-validate', + '--add-include-path', join_paths(meson.current_build_dir()), + '--add-include-path', join_paths(meson.current_source_dir()), @@ -44,6 +46,7 @@ index 1cb514a..f873068 100644 + girscanner, + '--output=@OUTPUT@', + '--no-libtool', ++ '--quiet', + '--reparse-validate', + '--add-include-path', join_paths(meson.current_build_dir()), + '--add-include-path', join_paths(meson.current_source_dir()), @@ -53,7 +56,7 @@ index 1cb514a..f873068 100644 dep_type = glib_dep.type_name() if dep_type == 'internal' -@@ -57,6 +69,12 @@ if dep_type == 'internal' +@@ -58,6 +71,12 @@ if dep_type == 'internal' '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] endif @@ -66,7 +69,7 @@ index 1cb514a..f873068 100644 # Take a glob and print to newlines globber = ''' from glob import glob -@@ -83,8 +101,8 @@ glib_command = scanner_command + [ +@@ -84,8 +103,8 @@ glib_command = scanner_command + [ if dep_type == 'pkgconfig' glib_command += ['--external-library', '--pkg=glib-2.0'] @@ -77,7 +80,7 @@ index 1cb514a..f873068 100644 glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') glib_files += join_paths(glib_libincdir, 'glibconfig.h') -@@ -338,7 +356,7 @@ endforeach +@@ -339,7 +358,7 @@ endforeach if giounix_dep.found() if dep_type == 'pkgconfig' gio_command += ['--pkg=gio-unix-2.0'] @@ -86,10 +89,10 @@ index 1cb514a..f873068 100644 # Get the installed gio-unix header list ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) if ret.returncode() != 0 -@@ -416,15 +434,24 @@ gir_files += custom_target('gir-girepository', - ] +@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository', ) + typelibs = [] +if get_option('enable-gi-cross-wrapper') != '' + gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', + '--includedir', meson.current_build_dir(), @@ -103,7 +106,7 @@ index 1cb514a..f873068 100644 +endif + foreach gir : gir_files - custom_target('generate-typelib-@0@'.format(gir).underscorify(), + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), input: gir, output: '@BASENAME@.typelib', depends: [gobject_gir, ], @@ -116,10 +119,10 @@ index 1cb514a..f873068 100644 install_dir: typelibdir, ) diff --git a/meson.build b/meson.build -index 17acd82..e0bb495 100644 +index 95bbd2b..f7baefd 100644 --- a/meson.build +++ b/meson.build -@@ -81,7 +81,9 @@ libffi_dep = dependency('libffi', +@@ -163,7 +163,9 @@ endif subdir('girepository') subdir('tools') subdir('giscanner') @@ -131,11 +134,11 @@ index 17acd82..e0bb495 100644 subdir('docs') subdir('tests') diff --git a/meson_options.txt b/meson_options.txt -index ee6958d..b168142 100644 +index 445a68a..a325511 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', - option('gir-dir-prefix', type: 'string', + option('gir_dir_prefix', type: 'string', description: 'Intermediate prefix for gir installation under ${prefix}' ) + |