meson: Fix build when glib-networking is a subproject

frida · May 30, 2024 · 5660571 · 5660571
1 parent d8a7c7d
commit 5660571
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/meson.build b/meson.build
@@ -484,7 +484,12 @@ tls_provider_dep = dependency('gioopenssl', required: get_option('connectivity')
   'gnome_proxy=disabled',
   'tests=false',
 ])
+tls_provider_vala_args = []
 if tls_provider_dep.found()
+  tls_provider_vala_args += [
+    '--pkg=gioopenssl',
+    '--vapidir=' + tls_provider_dep.get_variable('vapidir'),
+  ]
   cdata.set('HAVE_GIOOPENSSL', 1)
   vala_flags += ['--define=HAVE_GIOOPENSSL']
   backend_deps_private += tls_provider_dep

diff --git a/portal/meson.build b/portal/meson.build
@@ -2,11 +2,6 @@ portal_sources = [
   'portal.vala',
 ]
 
-extra_vala_args = []
-if tls_provider_dep.found()
-  extra_vala_args += '--pkg=gioopenssl'
-endif
-
 extra_link_args = []
 extra_link_depends = []
 if host_os_family == 'darwin'
@@ -25,7 +20,7 @@ if tls_provider_dep.found()
 endif
 
 raw_portal = executable('frida-portal-raw', portal_sources,
-  vala_args: [core_vala_args, '--pkg=posix', extra_vala_args],
+  vala_args: [core_vala_args, tls_provider_vala_args, '--pkg=posix'],
   link_args: extra_link_args,
   link_depends: extra_link_depends,
   dependencies: [core_dep] + extra_deps,