meson: Avoid triggering Vala requirement heuristic

Our configure script, which is a thin wrapper around Meson's setup command, has an overly simplistic heuristic to detect whether a project needs the Vala compiler. We should figure out a better solution, but this will have to do for now.
frida · May 30, 2024 · d1e1069 · d1e1069
1 parent 2489f42
commit d1e1069
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/gum/meson.build b/gum/meson.build
@@ -361,6 +361,7 @@ if gir.found()
   )
 endif
 
+uninstalled_vapidir = meson.current_source_dir() / 'vapi'
 
 uninstalled_variables = {
   'frida_vapidir': uninstalled_vapidir,
@@ -369,7 +370,7 @@ uninstalled_variables = {
 }
 
 installed_variables = {
-  'frida_vapidir': vapidir,
+  'frida_vapidir': get_option('prefix') / 'share' / 'vala' / 'vapi',
   'frida_dbghelp_prefix': dbghelp_prefix,
   'frida_symsrv_prefix': symsrv_prefix,
 }

diff --git a/meson.build b/meson.build
@@ -747,9 +747,6 @@ endif
 install_header_basedir = 'frida-' + api_version
 install_header_subdir = install_header_basedir + '/gum'
 
-vapidir = get_option('prefix') / 'share' / 'vala' / 'vapi'
-uninstalled_vapidir = meson.current_source_dir() / 'vapi'
-
 subdir('ext')
 subdir('gum')
 if not diet

diff --git a/vapi/meson.build b/vapi/meson.build
@@ -22,4 +22,4 @@ if have_gumjs
   ]
 endif
 
-install_data(vapis, install_dir: vapidir)
+install_data(vapis, install_dir: get_option('prefix') / 'share' / 'vala' / 'vapi')
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ if have_gumjs @@
       ]
     endif
-    install_data(vapis, install_dir: vapidir)
+    install_data(vapis, install_dir: get_option('prefix') / 'share' / 'vala' / 'vapi')