[gvfs] build: Fix gvfsd-metadata build when gudev is disabled
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] build: Fix gvfsd-metadata build when gudev is disabled
- Date: Wed, 24 Jan 2018 11:35:26 +0000 (UTC)
commit d7262a65a15178c8782c5d76c506d9b48fd8b788
Author: Ting-Wei Lan <lantw src gnome org>
Date: Wed Jan 24 02:54:40 2018 +0800
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 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/metadata/meson.build b/metadata/meson.build
index e1625b8..4d47850 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
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]