From 256bbbe03128e10d8d0432edfec2c8f203f20f7c Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 27 Apr 2010 10:07:31 +0200 Subject: vala / freesmartphone: vala now also looks in the target directory for vapi files We can finally inherit autotools now and remove legacy staging --- classes/vala.bbclass | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'classes') diff --git a/classes/vala.bbclass b/classes/vala.bbclass index 433b64e87e..3510a8acf3 100644 --- a/classes/vala.bbclass +++ b/classes/vala.bbclass @@ -1,19 +1,15 @@ # Vala has problems with multiple concurrent invocations PARALLEL_MAKE = "" +# Vala needs vala-native DEPENDS += "vala-native" +# Vala looks in STAGING_DATADIR for .vapi files +export STAGING_DATADIR + +# Package additional files FILES_${PN}-dev += "\ ${datadir}/vala/vapi/*.vapi \ ${datadir}/vala/vapi/*.deps \ + ${datadir}/gir-1.0 \ " - -VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)" - -# .vapi and .deps files are arch independent and need to be present in the -# staging datadir for the native vala compiler -do_stage_append() { - install -d ${STAGING_DATADIR_NATIVE}/vala/vapi - for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done - for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done -} -- cgit v1.2.3