46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
|
From 1cd86d4978ad32405b41f864e11ac21a2474c2f3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marcus Folkesson <marcus.folkesson@gmail.com>
|
||
|
|
Date: Tue, 3 Jul 2018 10:02:46 +0200
|
||
|
|
Subject: [PATCH] build: add ostree-soup-* to build process when configured
|
||
|
|
with avahi
|
||
|
|
|
||
|
|
Avoid getting these link errors:
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_set_path'
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_new'
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_free'
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_set_scheme'
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_to_string'
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_set_host'
|
||
|
|
./.libs/libostree-1.so: undefined reference to `soup_uri_set_port'
|
||
|
|
collect2: error: ld returned 1 exit status
|
||
|
|
|
||
|
|
Reproduce with:
|
||
|
|
./configure --with-avahi --without-soup
|
||
|
|
|
||
|
|
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
|
||
|
|
---
|
||
|
|
Makefile-libostree.am | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/Makefile-libostree.am b/Makefile-libostree.am
|
||
|
|
index 01a209d1..dbc9ebb8 100644
|
||
|
|
--- a/Makefile-libostree.am
|
||
|
|
+++ b/Makefile-libostree.am
|
||
|
|
@@ -238,6 +238,13 @@ if USE_LIBSOUP
|
||
|
|
libostree_1_la_SOURCES += src/libostree/ostree-fetcher-soup.c
|
||
|
|
libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
|
||
|
|
libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
|
||
|
|
+else
|
||
|
|
+if USE_AVAHI
|
||
|
|
+libostree_1_la_SOURCES += src/libostree/ostree-soup-uri.h \
|
||
|
|
+ src/libostree/ostree-soup-uri.c \
|
||
|
|
+ src/libostree/ostree-soup-form.c \
|
||
|
|
+ $(NULL)
|
||
|
|
+endif
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|