public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
* [PATCH 1/2] pixbufcache: Ensure sysroot dependencies are satisfied
@ 2016-10-11 14:17 Kyle Russell
  2016-10-11 14:17 ` [PATCH 2/2] librsvg: Add missing pixbufcache dependencies Kyle Russell
  2016-10-11 18:29 ` [PATCH 1/2] pixbufcache: Ensure sysroot dependencies are satisfied Martin Jansa
  0 siblings, 2 replies; 9+ messages in thread
From: Kyle Russell @ 2016-10-11 14:17 UTC (permalink / raw)
  To: openembedded-core

Reverts part of b411085fefc8582d24c172db5f6610705eb44c2f

Makes sure gdk-pixbuf-native populates the sysroot during setscene;
otherwise, gdk-pixbuf-query-loaders may not actually be available at the
time the completion function runs, causing a build failure.

Similarly, packages providing loader libraries should append to
PIXBUFCACHE_SYSROOT_DEPS with their runtime dependencies.

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
---
 meta/classes/pixbufcache.bbclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index dbe11e1..3c1e398 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -65,3 +65,17 @@ pixbufcache_sstate_postinst() {
 	fi
 }
 
+# Add all of the dependencies of gdk-pixbuf as dependencies of
+# do_populate_sysroot_setscene so that pixbufcache_sstate_postinst can work
+# (otherwise gdk-pixbuf-query-loaders may not exist or link). Only add
+# gdk-pixbuf-native if we're not building gdk-pixbuf itself.
+#
+# Packages that use this class should extend this variable with their runtime
+# dependencies.
+PIXBUFCACHE_SYSROOT_DEPS = ""
+PIXBUFCACHE_SYSROOT_DEPS_class-native = "\
+    ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} \
+"
+
+do_populate_sysroot_setscene[depends] += "${PIXBUFCACHE_SYSROOT_DEPS}"
+do_populate_sysroot[depends] += "${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')}"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-11-10 13:58 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-11 14:17 [PATCH 1/2] pixbufcache: Ensure sysroot dependencies are satisfied Kyle Russell
2016-10-11 14:17 ` [PATCH 2/2] librsvg: Add missing pixbufcache dependencies Kyle Russell
2016-10-11 14:57   ` Burton, Ross
2016-10-11 16:44     ` Kyle Russell
2016-10-13 13:09       ` Burton, Ross
2016-10-14  9:55         ` Kyle Russell
2016-11-10 13:58           ` Kyle Russell
2016-10-11 18:29 ` [PATCH 1/2] pixbufcache: Ensure sysroot dependencies are satisfied Martin Jansa
2016-10-11 18:51   ` Kyle Russell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox