0002-build-add-ostree-soup-to-build-process-when-configur.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 1cd86d4978ad32405b41f864e11ac21a2474c2f3 Mon Sep 17 00:00:00 2001
  2. From: Marcus Folkesson <marcus.folkesson@gmail.com>
  3. Date: Tue, 3 Jul 2018 10:02:46 +0200
  4. Subject: [PATCH] build: add ostree-soup-* to build process when configured
  5. with avahi
  6. Avoid getting these link errors:
  7. ./.libs/libostree-1.so: undefined reference to `soup_uri_set_path'
  8. ./.libs/libostree-1.so: undefined reference to `soup_uri_new'
  9. ./.libs/libostree-1.so: undefined reference to `soup_uri_free'
  10. ./.libs/libostree-1.so: undefined reference to `soup_uri_set_scheme'
  11. ./.libs/libostree-1.so: undefined reference to `soup_uri_to_string'
  12. ./.libs/libostree-1.so: undefined reference to `soup_uri_set_host'
  13. ./.libs/libostree-1.so: undefined reference to `soup_uri_set_port'
  14. collect2: error: ld returned 1 exit status
  15. Reproduce with:
  16. ./configure --with-avahi --without-soup
  17. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
  18. ---
  19. Makefile-libostree.am | 7 +++++++
  20. 1 file changed, 7 insertions(+)
  21. diff --git a/Makefile-libostree.am b/Makefile-libostree.am
  22. index 01a209d1..dbc9ebb8 100644
  23. --- a/Makefile-libostree.am
  24. +++ b/Makefile-libostree.am
  25. @@ -238,6 +238,13 @@ if USE_LIBSOUP
  26. libostree_1_la_SOURCES += src/libostree/ostree-fetcher-soup.c
  27. libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
  28. libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
  29. +else
  30. +if USE_AVAHI
  31. +libostree_1_la_SOURCES += src/libostree/ostree-soup-uri.h \
  32. + src/libostree/ostree-soup-uri.c \
  33. + src/libostree/ostree-soup-form.c \
  34. + $(NULL)
  35. +endif
  36. endif
  37. endif
  38. --
  39. 2.18.0