Blame SOURCES/flatpak-ostree-bundle.patch

b7e9ca
Make sure rpath gets added for ostree libs
b7e9ca
b7e9ca
We bundle ostree in the package, so we need to make sure an rpath
b7e9ca
gets set pointing to our bundled library.
b7e9ca
b7e9ca
The Makefiles are missing the OSTREE_LIBS (and so the -Wl,-rpath),
b7e9ca
so add them in.
b7e9ca
--- flatpak-1.0.1/session-helper/Makefile.am.inc.old	2018-08-08 16:56:20.000000000 +0200
b7e9ca
+++ flatpak-1.0.1/session-helper/Makefile.am.inc	2018-09-12 13:23:08.304959872 +0200
b7e9ca
@@ -12,5 +12,5 @@
b7e9ca
 	session-helper/flatpak-session-helper.c	\
b7e9ca
 	$(NULL)
b7e9ca
 
b7e9ca
-flatpak_session_helper_LDADD = $(AM_LDADD) $(BASE_LIBS) libflatpak-common.la
b7e9ca
+flatpak_session_helper_LDADD = $(AM_LDADD) $(BASE_LIBS) $(OSTREE_LIBS) libflatpak-common.la
b7e9ca
 flatpak_session_helper_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(SOUP_CFLAGS) $(OSTREE_CFLAGS) $(GSYSTEM_CFLAGS) $(JSON_CFLAGS) -DFLATPAK_COMPILATION
b7e9ca
--- flatpak-1.0.1/portal/Makefile.am.inc.old	2018-08-08 16:56:20.000000000 +0200
b7e9ca
+++ flatpak-1.0.1/portal/Makefile.am.inc	2018-09-12 13:23:54.795014399 +0200
b7e9ca
@@ -34,6 +34,6 @@
b7e9ca
 BUILT_SOURCES += $(nodist_flatpak_portal_SOURCES)
b7e9ca
 CLEANFILES += $(nodist_flatpak_portal_SOURCES)
b7e9ca
 
b7e9ca
-flatpak_portal_LDADD = $(AM_LDADD) $(BASE_LIBS)
b7e9ca
+flatpak_portal_LDADD = $(AM_LDADD) $(BASE_LIBS) $(OSTREE_LIBS)
b7e9ca
 flatpak_portal_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) -DFLATPAK_COMPILATION
b7e9ca
 flatpak_portal_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/portal