1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
|
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 25 Jun 2025 12:09:04 +0200
Subject: pfs: build: Ensure resources get compiled before the lib
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Closes: #1107898
Signed-off-by: Guido Günther <agx@sigxcpu.org>
---
subprojects/pfs/src/meson.build | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
--- a/subprojects/pfs/src/meson.build
+++ b/subprojects/pfs/src/meson.build
@@ -1,7 +1,12 @@
pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
gnome = import('gnome')
-gnome.compile_resources('pfs', 'pfs.gresource.xml', gresource_bundle: true, install_dir: pkgdatadir)
+compiled_resources = gnome.compile_resources(
+ 'pfs',
+ 'pfs.gresource.xml',
+ gresource_bundle: true,
+ install_dir: pkgdatadir,
+)
conf = configuration_data()
conf.set_quoted('VERSION', meson.project_version())
@@ -54,6 +59,7 @@ cargo_static_lib_build = custom_target(
meson.project_build_root() / 'src' / get_option('deb_triplet') / rust_target / 'libpfs.a',
'@OUTPUT@',
],
+ depends: compiled_resources,
)
if get_option('shared-lib')
@@ -92,6 +98,7 @@ if get_option('shared-lib')
'libpfs-0.so',
'@OUTPUT@',
],
+ depends: compiled_resources,
)
pkg = pkgconfig.generate(
|