@@ -11,8 +11,6 @@ VALADEPENDS = ""
VALADEPENDS:class-target = "vala"
DEPENDS:append = " vala-native ${VALADEPENDS}"
-# 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}:${STAGING_LIBDIR}"
@@ -22,9 +20,3 @@ FILES:${PN}-dev += "\
${datadir}/vala/vapi/*.deps \
${datadir}/gir-1.0 \
"
-
-# Remove vapigen.m4 that is bundled with tarballs
-# because it does not yet have our cross-compile fixes
-do_configure:prepend() {
- rm -f ${S}/m4/vapigen.m4
-}
We don't patch vala anymore, so there's no need to export STAGING_DATADIR (as vala respects the pkgconfig variables) or delete vapigen.m4 (as we don't patch the upstream file). Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/classes-recipe/vala.bbclass | 8 -------- 1 file changed, 8 deletions(-)