79 lines
2.9 KiB
Diff
79 lines
2.9 KiB
Diff
|
From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Sat, 18 Jul 2020 10:00:50 +0200
|
||
|
|
Subject: [PATCH] meson.build: fix linking with libmetadata
|
||
|
|
|
||
|
|
libmetadata is built as a static library and depends on libgvfscommon so
|
||
|
|
change the dependencies order to put libgvfscommon_dep after
|
||
|
|
libmetadata_dep or gvfsd-metadata will fail to link on:
|
||
|
|
|
||
|
|
FAILED: metadata/gvfsd-metadata
|
||
|
|
/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata@exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata
|
||
|
|
metadata/libmetadata.a(metatree.c.o): In function `safe_open':
|
||
|
|
metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string'
|
||
|
|
collect2: error: ld returned 1 exit status
|
||
|
|
|
||
|
|
Apply this change in the whole source code and not only for
|
||
|
|
gvfsd-metadata to avoid any other build failures.
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
- http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Upstream status:
|
||
|
|
https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92]
|
||
|
|
---
|
||
|
|
client/meson.build | 2 +-
|
||
|
|
metadata/meson.build | 5 +++--
|
||
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/client/meson.build b/client/meson.build
|
||
|
|
index 8f57d0d3..1d251481 100644
|
||
|
|
--- a/client/meson.build
|
||
|
|
+++ b/client/meson.build
|
||
|
|
@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files(
|
||
|
|
|
||
|
|
deps = [
|
||
|
|
gio_unix_dep,
|
||
|
|
- libgvfscommon_dep,
|
||
|
|
libmetadata_dep,
|
||
|
|
+ libgvfscommon_dep,
|
||
|
|
]
|
||
|
|
|
||
|
|
cflags = [
|
||
|
|
diff --git a/metadata/meson.build b/metadata/meson.build
|
||
|
|
index 4e120d18..5699e6f2 100644
|
||
|
|
--- a/metadata/meson.build
|
||
|
|
+++ b/metadata/meson.build
|
||
|
|
@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency(
|
||
|
|
)
|
||
|
|
|
||
|
|
deps = [
|
||
|
|
- libgvfscommon_dep,
|
||
|
|
libmetadata_dep,
|
||
|
|
+ libgvfscommon_dep,
|
||
|
|
]
|
||
|
|
|
||
|
|
if enable_gudev
|
||
|
|
@@ -105,8 +105,8 @@ if enable_devel_utils
|
||
|
|
app + '.c',
|
||
|
|
include_directories: top_inc,
|
||
|
|
dependencies: [
|
||
|
|
- libgvfscommon_dep,
|
||
|
|
libmetadata_dep,
|
||
|
|
+ libgvfscommon_dep,
|
||
|
|
],
|
||
|
|
c_args: cflags,
|
||
|
|
)
|
||
|
|
@@ -119,6 +119,7 @@ if enable_devel_utils
|
||
|
|
include_directories: top_inc,
|
||
|
|
dependencies: [
|
||
|
|
libmetadata_dep,
|
||
|
|
+ libgvfscommon_dep,
|
||
|
|
libxml_dep,
|
||
|
|
],
|
||
|
|
c_args: cflags,
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|