diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb | 12 |
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 3b9da89f3f..f1f9217d1b 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 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native zlib" | 6 | DEPENDS += "libffi python-argparse-native zlib" |
@@ -25,6 +25,10 @@ SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BP | |||
25 | SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" | 25 | SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" |
26 | BBCLASSEXTEND = "native nativesdk" | 26 | BBCLASSEXTEND = "native nativesdk" |
27 | 27 | ||
28 | PERLPATH = "${bindir}/env perl" | ||
29 | PERLPATH_virtclass-native = "/usr/bin/env perl" | ||
30 | PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" | ||
31 | |||
28 | do_configure_prepend() { | 32 | do_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 | ||
44 | PACKAGES += "${PN}-codegen" | 54 | PACKAGES += "${PN}-codegen" |