diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 17 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 1 |
3 files changed, 8 insertions, 15 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 9a7febe666..119b443649 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -77,9 +77,6 @@ DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through | |||
77 | 77 | ||
78 | inherit libc-common multilib_header | 78 | inherit libc-common multilib_header |
79 | 79 | ||
80 | PERLPATH = "${bindir}/env perl" | ||
81 | PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" | ||
82 | |||
83 | do_install_append () { | 80 | do_install_append () { |
84 | rm -f ${D}${sysconfdir}/localtime | 81 | rm -f ${D}${sysconfdir}/localtime |
85 | rm -rf ${D}${localstatedir} | 82 | rm -rf ${D}${localstatedir} |
@@ -87,7 +84,7 @@ do_install_append () { | |||
87 | oe_multilib_header bits/syscall.h | 84 | oe_multilib_header bits/syscall.h |
88 | 85 | ||
89 | if [ -f ${D}${bindir}/mtrace ]; then | 86 | if [ -f ${D}${bindir}/mtrace ]; then |
90 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' -e '2s,exec.*perl,exec ${PERLPATH},' ${D}${bindir}/mtrace | 87 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace |
91 | fi | 88 | fi |
92 | } | 89 | } |
93 | 90 | ||
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 85352edb23..1f8ad7d0a7 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,6 +1,6 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native zlib" | 6 | DEPENDS += "libffi python-argparse-native zlib" |
@@ -22,15 +22,12 @@ 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 | PERLPATH = "${bindir}/env perl" | ||
26 | PERLPATH_virtclass-native = "/usr/bin/env perl" | ||
27 | PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" | ||
28 | |||
29 | do_configure_prepend() { | 25 | do_configure_prepend() { |
30 | # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) | 26 | # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) |
31 | sed -i '/^docs/d' ${S}/configure.ac | 27 | sed -i '/^docs/d' ${S}/configure.ac |
32 | sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am | 28 | sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am |
33 | sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am | 29 | sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am |
30 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | ||
34 | } | 31 | } |
35 | 32 | ||
36 | do_install_append() { | 33 | do_install_append() { |
@@ -44,6 +41,6 @@ do_install_append() { | |||
44 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location | 41 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location |
45 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | 42 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. |
46 | if [ -f ${D}${bindir}/glib-mkenums ]; then | 43 | if [ -f ${D}${bindir}/glib-mkenums ]; then |
47 | sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/glib-mkenums | 44 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums |
48 | fi | 45 | fi |
49 | } | 46 | } |
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 9ae02d9456..2f48e27f0e 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -31,7 +31,6 @@ EXTRA_OECONF = "--disable-debug --enable-included-printf=no ${CORECONF}" | |||
31 | EXTRA_OECONF_virtclass-native = "${CORECONF}" | 31 | EXTRA_OECONF_virtclass-native = "${CORECONF}" |
32 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}" | 32 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}" |
33 | 33 | ||
34 | |||
35 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ | 34 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ |
36 | ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" | 35 | ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" |
37 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | 36 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ |