summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-04-16 08:36:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 21:53:00 (GMT)
commitca14115a12f288be8bdac251b4412a593fb88fe1 (patch)
tree890416356f731e4183823cdaccdbe28b70d7f8a8 /meta/recipes-core
parentb99e2f2f33732713a0288e356d2b084b199f0399 (diff)
downloadpoky-ca14115a12f288be8bdac251b4412a593fb88fe1.tar.gz
glib-2.0: fix builds on fedora 17
Generally distros keep perl at /usr/bin/perl Fedora 17 also has /bin/perl this causes glib-2.0 build on such distros to put perl interpreter path in the perl scripts as /bin/perl But we set perl location for target as /usr/bin/perl This mismatch of perl path causes failure of rootfs image creation like this: | error: Failed dependencies: | /bin/perl is needed by libglib-2.0-utils-2.30.3-r0.ppc603e NOTE: package meta-toolchain-gmae-1.0-r7: task do_populate_sdk: Failed [YOCTO #2304] (From OE-Core rev: 13e6e316d751d0ea3107d5547f6bdd2b74919cad) Signed-off-by: Robert Yang <liezhi.yang@windriver.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.30.3.bb12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
index 3b9da89..f1f9217 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb
@@ -1,6 +1,6 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r0" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
@@ -25,6 +25,10 @@ SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BP
25SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" 25SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
26BBCLASSEXTEND = "native nativesdk" 26BBCLASSEXTEND = "native nativesdk"
27 27
28PERLPATH = "${bindir}/env perl"
29PERLPATH_virtclass-native = "/usr/bin/env perl"
30PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
31
28do_configure_prepend() { 32do_configure_prepend() {
29 # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) 33 # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
30 sed -i '/^docs/d' ${S}/configure.ac 34 sed -i '/^docs/d' ${S}/configure.ac
@@ -39,6 +43,12 @@ do_install_append() {
39 # and empty dirs 43 # and empty dirs
40 rmdir ${D}${libdir}/gio/modules/ 44 rmdir ${D}${libdir}/gio/modules/
41 rmdir ${D}${libdir}/gio/ 45 rmdir ${D}${libdir}/gio/
46
47 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
48 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
49 if [ -f ${D}${bindir}/glib-mkenums ]; then
50 sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/glib-mkenums
51 fi
42} 52}
43 53
44PACKAGES += "${PN}-codegen" 54PACKAGES += "${PN}-codegen"