Skip to content

Commit 26f96a1

Browse files
rpurdieTingPing
authored andcommitted
meson.build: fix build race when building GTK vapi files
There's a build race when building the GTK vapi files: FAILED: libportal/libportal-gtk4.vapi error: Package `libportal' not found in specified Vala API directories or GObject-Introspection GIR directories This can be verified by adding "sleep 10;" to the command for the libportal/libportal.vapi target in the generated build.ninja file. The GTK vapi files need to have access to the generic libportal.vapi file, but there is no explicit dependency. Switch the dependency name 'libportal' to the dependency object libportal_vapi so that Meson generates the dependency correctly. Signed-off-by: Richard Purdie <[email protected]>
1 parent 7c408fb commit 26f96a1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libportal/meson.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ if gtk3_dep.found()
168168
if vapi
169169
libportal_gtk3_vapi = gnome.generate_vapi('libportal-gtk3',
170170
sources: libportal_gtk3_gir[0],
171-
packages: ['gio-2.0', 'gtk+-3.0', 'libportal'],
171+
packages: ['gio-2.0', 'gtk+-3.0', libportal_vapi],
172172
gir_dirs: [meson.current_build_dir()],
173173
vapi_dirs: [meson.current_build_dir()],
174174
install: true,
@@ -227,7 +227,7 @@ if gtk4_dep.found()
227227
if vapi
228228
libportal_gtk4_vapi = gnome.generate_vapi('libportal-gtk4',
229229
sources: libportal_gtk4_gir[0],
230-
packages: ['gio-2.0', 'gtk4', 'libportal'],
230+
packages: ['gio-2.0', 'gtk4', libportal_vapi],
231231
gir_dirs: [meson.current_build_dir()],
232232
vapi_dirs: [meson.current_build_dir()],
233233
install: true,

0 commit comments

Comments
 (0)