meson: rename cross options to not start with cross_

Newer meson warns that option names can't start with "cross_", so
we have to prefix them:

"Option uses prefix "cross_", which is reserved for Meson. This will become an error in the future."

2 files changed, 14 insertions, 14 deletions

diff --git a/gir/meson.build b/gir/meson.build
index a0b96cfd..04f9371a 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -41,7 +41,7 @@ gir_files = [
 typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
 install_data(gir_files, install_dir: girdir)
 
-if get_option('cross_use_host_gi')
+if get_option('gi_cross_use_host_gi')
     scanner_command = [
       'g-ir-scanner',
     ]
@@ -72,11 +72,11 @@ if dep_type == 'internal'
                       '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
 endif
 
-if get_option('cross_gi_binary_wrapper') != ''
-  scanner_command += ['--use-binary-wrapper=' + get_option('cross_gi_binary_wrapper')]
+if get_option('gi_cross_binary_wrapper') != ''
+  scanner_command += ['--use-binary-wrapper=' + get_option('gi_cross_binary_wrapper')]
 endif
-if get_option('cross_gi_ldd_wrapper') != ''
-  scanner_command += ['--use-ldd-wrapper=' + get_option('cross_gi_ldd_wrapper')]
+if get_option('gi_cross_ldd_wrapper') != ''
+  scanner_command += ['--use-ldd-wrapper=' + get_option('gi_cross_ldd_wrapper')]
 endif
 # Take a glob and print to newlines
 globber = '''
@@ -104,8 +104,8 @@ glib_command = scanner_command + [
 
 if dep_type == 'pkgconfig'
   glib_command += ['--external-library', '--pkg=glib-2.0']
-  glib_libdir = get_option('cross_pkgconfig_sysroot_path') + glib_dep.get_pkgconfig_variable('libdir')
-  glib_incdir = get_option('cross_pkgconfig_sysroot_path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
+  glib_libdir = get_option('gi_cross_pkgconfig_sysroot_path') + glib_dep.get_pkgconfig_variable('libdir')
+  glib_incdir = get_option('gi_cross_pkgconfig_sysroot_path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
   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')
@@ -360,7 +360,7 @@ if giounix_dep.found()
   dep_type = giounix_dep.type_name()
   if dep_type == 'pkgconfig'
     gio_command += ['--pkg=gio-unix-2.0']
-    giounix_includedir = get_option('cross_pkgconfig_sysroot_path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
+    giounix_includedir = get_option('gi_cross_pkgconfig_sysroot_path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
     # Get the installed gio-unix header list
     ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
     if ret.returncode() != 0
@@ -443,8 +443,8 @@ gir_files += custom_target('gir-girepository',
 )
 
 typelibs = []
-if get_option('cross_gi_binary_wrapper') != ''
-    gircompiler_command = [get_option('cross_gi_binary_wrapper'), gircompiler.full_path(), ]
+if get_option('gi_cross_binary_wrapper') != ''
+    gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ]
 else
     gircompiler_command = [gircompiler, ]
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 03096f5e..20ccc3b9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,15 +26,15 @@ option('gir_dir_prefix', type: 'string',
   description: 'Intermediate prefix for gir installation under ${prefix}'
 )
 
-option('cross_use_host_gi', type: 'boolean', value : false,
+option('gi_cross_use_host_gi', type: 'boolean', value : false,
   description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)'
 )
 
-option('cross_gi_binary_wrapper', type: 'string',
+option('gi_cross_binary_wrapper', type: 'string',
   description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)'
 )
 
-option('cross_gi_ldd_wrapper', type: 'string',
+option('gi_cross_ldd_wrapper', type: 'string',
   description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
 )
 
@@ -42,6 +42,6 @@ option('build_introspection_data', type: 'boolean', value : true,
   description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
 )
 
-option('cross_pkgconfig_sysroot_path', type: 'string',
+option('gi_cross_pkgconfig_sysroot_path', type: 'string',
   description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)'
 )