diff options
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb | 9 | ||||
| -rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb | 15 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 2 |
3 files changed, 11 insertions, 15 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb index cb589bb82d..98e5090bc8 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.1.bb @@ -93,12 +93,3 @@ do_install_append_class-native() { GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders } BBCLASSEXTEND = "native" - -SSTATEPREINSTFUNCS_append_class-native = " gdkpixbuf_sstate_preinst" -SYSROOT_PREPROCESS_FUNCS_append_class-native = " gdkpixbuf_sstate_preinst" - -gdkpixbuf_sstate_preinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" ]; then - rm -rf ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/* - fi -} diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb index 0c29a3b377..15c8c00f0a 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.50.0.bb @@ -34,7 +34,7 @@ DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native" # (standard ldd doesn't work when cross-compiling). DEPENDS_class-target_append = " gobject-introspection-native qemu-native prelink-native" -SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir" +SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir postinst-ldsoconf-${PN}" do_configure_prepend_class-native() { # Tweak the native python scripts so that they don't refer to the @@ -166,8 +166,13 @@ python gobject_introspection_preconfigure () { oe.utils.write_ld_so_conf(d) } -SSTATEPOSTINSTFUNCS += "gobject_introspection_postinst" -python gobject_introspection_postinst () { - if d.getVar("BB_CURRENTTASK").startswith("populate_sysroot"): - oe.utils.write_ld_so_conf(d) +SYSROOT_PREPROCESS_FUNCS_append = " gi_ldsoconf_sysroot_preprocess" +gi_ldsoconf_sysroot_preprocess () { + mkdir -p ${SYSROOT_DESTDIR}${bindir} + dest=${SYSROOT_DESTDIR}${bindir}/postinst-ldsoconf-${PN} + echo "#!/bin/sh" > $dest + echo "echo mkdir -p ${STAGING_DIR_TARGET}${sysconfdir} > ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest + echo "echo ${base_libdir} >> ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest + echo "echo ${libdir} >> ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf" >> $dest + chmod 755 $dest } diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 6499ea6c8d..9c104e28c0 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -31,7 +31,7 @@ EXTRA_OECONF += " \ --enable-modules \ --disable-cups \ --disable-colord \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ + WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ " EXTRA_OECONF[vardepsexclude] = "MACHINE" |