From 5416bf849ceefb49f06bedfa5e67595e9c68582a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Aug 2012 21:58:20 -0700 Subject: glib-2.0-nativesdk: Add dependency on glib-2.0-native when we build for nativesdk it needs tools from installed glib-2.0-dev package. We zeroes out compile_resourses but then genmarshal came up so instead of going about disabling them one by one lets depend on glib-2.0-native since thats the right thing to do. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/glib-2.0') diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb index 932c9466f5..8f7cd69f82 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb @@ -1,11 +1,11 @@ require glib.inc -PR = "r3" +PR = "r4" PE = "1" DEPENDS += "libffi python-argparse-native zlib" DEPENDS_virtclass-native += "libffi-native python-argparse-native" -DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk" +DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk ${BPN}-native" SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" @@ -22,7 +22,6 @@ SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b1 SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk" -CACHED_CONFIGUREVARS_virtclass-nativesdk = "ac_cv_path_GLIB_COMPILE_RESOURCES=/bin/true" do_configure_prepend() { sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in -- cgit v1.2.3