summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-06-02 12:25:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 13:13:26 +0100
commit2e5367ee16a9bf72fa1e076368974a952850922a (patch)
treeaabf54744c10de141a3ae5caa27166dad4f16e98 /meta/recipes-core
parentf5d36b1c5640f4d2975ba110fdb8a918b17ecbcd (diff)
downloadpoky-2e5367ee16a9bf72fa1e076368974a952850922a.tar.gz
glib: move to Python 3
Drop python-pygobject and python-dbus dependencies, because nothing in ptests depends on them, and it creates a circular dependency chain. (From OE-Core rev: 95840a416afd50dc6140367570f045c5128c94f4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index ddf5e40b9f..c6b8e57e7d 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -26,7 +26,7 @@ PACKAGES += "${PN}-codegen ${PN}-utils"
26 26
27LEAD_SONAME = "libglib-2.0.*" 27LEAD_SONAME = "libglib-2.0.*"
28 28
29inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache 29inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache python3native
30 30
31S = "${WORKDIR}/glib-${PV}" 31S = "${WORKDIR}/glib-${PV}"
32 32
@@ -44,7 +44,7 @@ EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
44EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" 44EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
45 45
46do_configure_prepend() { 46do_configure_prepend() {
47 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in 47 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
48} 48}
49 49
50FILES_${PN} = "${libdir}/lib*${SOLIBS} \ 50FILES_${PN} = "${libdir}/lib*${SOLIBS} \
@@ -73,7 +73,7 @@ USE_NLS = "yes"
73 73
74do_install_append () { 74do_install_append () {
75 if [ -f ${D}${bindir}/gtester-report ]; then 75 if [ -f ${D}${bindir}/gtester-report ]; then
76 sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python|' 76 sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|'
77 fi 77 fi
78 78
79 # Remove some unpackaged files 79 # Remove some unpackaged files
@@ -109,8 +109,6 @@ RDEPENDS_${PN}-ptest += "\
109 tzdata-asia \ 109 tzdata-asia \
110 tzdata-europe \ 110 tzdata-europe \
111 tzdata-posix \ 111 tzdata-posix \
112 python-pygobject \
113 python-dbus \
114 shared-mime-info \ 112 shared-mime-info \
115 " 113 "
116 114