From f15dd93fe454d377dac331ad45dd239b23c1eadc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 26 Apr 2010 16:34:35 +0200 Subject: Revert "vala.bbclass and assorted recipes: create own task for installing .vapi and .deps instead of using do_stage()" * This reverts commit a38e7ff2810e55455c7ff7b01d4882344b420e18. * It was discussed on oe-devel ML and ACKed by Mickey * Side effect of this was also: Everything rebuilt after it cannot be found when used later (NOTE: Couldn't find shared library provider for libfso-glib.so.0) and it's dropped from package RDEPENDS. --- classes/vala.bbclass | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/vala.bbclass b/classes/vala.bbclass index e6b601bff7..433b64e87e 100644 --- a/classes/vala.bbclass +++ b/classes/vala.bbclass @@ -6,19 +6,14 @@ DEPENDS += "vala-native" 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 -vala_do_stage_vapi() { +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 } - -EXPORT_FUNCTIONS do_stage_vapi - -addtask stage_vapi after do_populate_staging before do_package -- cgit 1.2.3-korg