diff options
Diffstat (limited to 'meta/recipes-support/vte/vte_0.44.2.bb')
| -rw-r--r-- | meta/recipes-support/vte/vte_0.44.2.bb | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/meta/recipes-support/vte/vte_0.44.2.bb b/meta/recipes-support/vte/vte_0.44.2.bb index a1204a3c3b..a0b671e05b 100644 --- a/meta/recipes-support/vte/vte_0.44.2.bb +++ b/meta/recipes-support/vte/vte_0.44.2.bb @@ -5,24 +5,39 @@ DEPENDS = "glib-2.0 gtk+3 intltool-native" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -inherit gnomebase gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection +inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection -SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch" +# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) +SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ + ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ + " SRC_URI[archive.md5sum] = "eca8f8a9d9f9bb8e9d592d0acfeec015" SRC_URI[archive.sha256sum] = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +# Instead of "inherit vala" we do the relevant settings here so we can +# set DEPENDS based on PACKAGECONFIG. + +# Our patched version of Vala looks in STAGING_DATADIR for .vapi files +export STAGING_DATADIR +# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files +export XDG_DATA_DIRS = "${STAGING_DATADIR}" + +# Package additional files +FILES_${PN}-dev += "${datadir}/vala/vapi/*" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala" PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" CFLAGS += "-D_GNU_SOURCE" -# Enable vala only if gobject-introspection is enabled -EXTRA_OECONF = "--enable-vala=auto --disable-test-application" +EXTRA_OECONF = "--disable-test-application" # libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. # Use libtool-cross (which has a hack to prevent that) instead. EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" PACKAGES =+ "libvte" -FILES_libvte = "${libdir}/*.so.*" +FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" |