diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-08-03 21:58:20 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:18:46 +0100 |
commit | 29503fa8da7b356afb74c88c35b65fe9a0d1c987 (patch) | |
tree | b0b01d35efde93066e4acefaa7a9a72d9eef3a0f /meta/recipes-core | |
parent | bce9306008897bb8028472b4dd7d954af709125b (diff) | |
download | poky-29503fa8da7b356afb74c88c35b65fe9a0d1c987.tar.gz |
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.
(From OE-Core rev: 5416bf849ceefb49f06bedfa5e67595e9c68582a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r3" | 3 | PR = "r4" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native zlib" | 6 | DEPENDS += "libffi python-argparse-native zlib" |
7 | DEPENDS_virtclass-native += "libffi-native python-argparse-native" | 7 | DEPENDS_virtclass-native += "libffi-native python-argparse-native" |
8 | DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk" | 8 | DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk ${BPN}-native" |
9 | 9 | ||
10 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 10 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" |
11 | 11 | ||
@@ -22,7 +22,6 @@ SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b1 | |||
22 | SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" | 22 | SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" |
23 | BBCLASSEXTEND = "native nativesdk" | 23 | BBCLASSEXTEND = "native nativesdk" |
24 | 24 | ||
25 | CACHED_CONFIGUREVARS_virtclass-nativesdk = "ac_cv_path_GLIB_COMPILE_RESOURCES=/bin/true" | ||
26 | do_configure_prepend() { | 25 | do_configure_prepend() { |
27 | sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am | 26 | sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am |
28 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | 27 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in |