|
 |
b0c5b1 |
Make sure rpath gets added for ostree libs
|
|
|
b0c5b1 |
|
|
|
b0c5b1 |
We bundle ostree in the package, so we need to make sure an rpath
|
|
|
b0c5b1 |
gets set pointing to our bundled library.
|
|
|
b0c5b1 |
|
|
|
b0c5b1 |
The Makefiles are missing the OSTREE_LIBS (and so the -Wl,-rpath),
|
|
|
b0c5b1 |
so add them in.
|
|
|
b0c5b1 |
diff --git a/document-portal/Makefile.am.inc b/document-portal/Makefile.am.inc
|
|
|
b0c5b1 |
--- a/document-portal/Makefile.am.inc 2017-11-08 16:52:40.135530435 -0500
|
|
|
b0c5b1 |
+++ b/document-portal/Makefile.am.inc 2017-11-08 16:52:53.340379677 -0500
|
|
|
b0c5b1 |
@@ -34,5 +34,5 @@ xdg_document_portal_SOURCES = \
|
|
|
b0c5b1 |
document-portal/xdp-fuse.c \
|
|
|
b0c5b1 |
$(NULL)
|
|
|
b0c5b1 |
|
|
|
b0c5b1 |
-xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) libflatpak-common.la
|
|
|
b0c5b1 |
+xdg_document_portal_LDADD = $(BASE_LIBS) $(FUSE_LIBS) $(OSTREE_LIBS) libflatpak-common.la
|
|
|
b0c5b1 |
xdg_document_portal_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(FUSE_CFLAGS) -I$(srcdir)/document-portal -I$(builddir)/document-portal -I$(srcdir)/permission-store -I$(builddir)/permission-store -DFLATPAK_COMPILATION
|
|
|
b0c5b1 |
diff --git a/permission-store/Makefile.am.inc b/permission-store/Makefile.am.inc
|
|
|
b0c5b1 |
--- a/permission-store/Makefile.am.inc 2017-11-09 14:34:13.681220097 -0500
|
|
|
b0c5b1 |
+++ b/permission-store/Makefile.am.inc 2017-11-09 14:34:20.578146811 -0500
|
|
|
b0c5b1 |
@@ -30,5 +30,5 @@ xdg_permission_store_SOURCES = \
|
|
|
b0c5b1 |
permission-store/xdg-permission-store.h \
|
|
|
b0c5b1 |
$(NULL)
|
|
|
b0c5b1 |
|
|
|
b0c5b1 |
-xdg_permission_store_LDADD = $(BASE_LIBS) libflatpak-common.la
|
|
|
b0c5b1 |
+xdg_permission_store_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) libflatpak-common.la
|
|
|
b0c5b1 |
xdg_permission_store_CFLAGS = $(BASE_CFLAGS) $(SOUP_CFLAGS) $(JSON_CFLAGS) $(OSTREE_CFLAGS) $(GSYSTEM_CFLAGS) -I$(srcdir)/permission-store -I$(builddir)/permission-store
|
|
|
b0c5b1 |
diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc
|
|
|
b0c5b1 |
--- a/session-helper/Makefile.am.inc 2017-11-09 14:34:47.849857022 -0500
|
|
|
b0c5b1 |
+++ b/session-helper/Makefile.am.inc 2017-11-09 14:35:01.377713286 -0500
|
|
|
b0c5b1 |
@@ -12,5 +12,5 @@ flatpak_session_helper_SOURCES = \
|
|
|
b0c5b1 |
session-helper/flatpak-session-helper.c \
|
|
|
b0c5b1 |
$(NULL)
|
|
|
b0c5b1 |
|
|
|
b0c5b1 |
-flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la
|
|
|
b0c5b1 |
+flatpak_session_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) libflatpak-common.la
|
|
|
b0c5b1 |
flatpak_session_helper_CFLAGS = $(BASE_CFLAGS) $(SOUP_CFLAGS) $(OSTREE_CFLAGS) $(GSYSTEM_CFLAGS) $(JSON_CFLAGS)
|