From d7262a65a15178c8782c5d76c506d9b48fd8b788 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Wed, 24 Jan 2018 02:54:40 +0800 Subject: build: Fix gvfsd-metadata build when gudev is disabled The order of dependencies of gvfsd-metadata is reversed to workaround undefined reference error on FreeBSD when -Wl,--as-needed is used. https://bugzilla.gnome.org/show_bug.cgi?id=786149 --- metadata/meson.build | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/metadata/meson.build b/metadata/meson.build index e1625b80..4d47850b 100644 --- a/metadata/meson.build +++ b/metadata/meson.build @@ -64,15 +64,20 @@ libmetadata_dep = declare_dependency( dependencies: glib_deps ) +metadata_deps = [ + libmetadata_dep, + libgvfscommon_dep +] + +if enable_gudev + metadata_deps += gudev_dep +endif + executable( 'gvfsd-metadata', 'meta-daemon.c', include_directories: top_inc, - dependencies: [ - libgvfscommon_dep, - libmetadata_dep, - gudev_dep - ], + dependencies: metadata_deps, c_args: cflags, install: true, install_rpath: gvfs_rpath, @@ -93,8 +98,8 @@ if enable_devel_utils app + '.c', include_directories: top_inc, dependencies: [ - libgvfscommon_dep, - libmetadata_dep + libmetadata_dep, + libgvfscommon_dep ], c_args: cflags ) -- cgit v1.2.1