summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-08 16:06:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-12 10:34:09 +0000
commitdb5d1274c5f9c00dafc36bfef775a1f4c449b005 (patch)
tree9d005ad2818fc1e45225a887b6d1dea5813e0acf /meta
parentc3935362109b2d446d6a0fcb35de51c9ecbca601 (diff)
downloadpoky-db5d1274c5f9c00dafc36bfef775a1f4c449b005.tar.gz
glib-2.0: move more logic to the .inc
The .bb was getting larger with configuration being arbitarily split between .bb and .inc. To help adding a glib_git recipe, strip the .bb down to SRC_URI. Also don't remove $libdir/gio as it should be owned by glib. (From OE-Core rev: 55b950500fd9d944042e3c2b0872685f0a60e8eb) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.38.1.bb47
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc47
2 files changed, 43 insertions, 51 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.38.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.38.1.bb
index 3e874d7ff0..a5db3025bf 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.38.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.38.1.bb
@@ -2,10 +2,6 @@ require glib.inc
2 2
3PE = "1" 3PE = "1"
4 4
5DEPENDS += "libffi zlib"
6DEPENDS_class-native += "libffi-native"
7DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native"
8
9SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" 5SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
10 6
11SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 7SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
@@ -21,46 +17,3 @@ SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
21 17
22SRC_URI[md5sum] = "f3f6789151c1810f2fe23fe9ebb8b828" 18SRC_URI[md5sum] = "f3f6789151c1810f2fe23fe9ebb8b828"
23SRC_URI[sha256sum] = "01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159" 19SRC_URI[sha256sum] = "01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159"
24
25BBCLASSEXTEND = "native nativesdk"
26
27RDEPENDS_${PN}-ptest += "\
28 gnome-desktop-testing \
29 tzdata \
30 tzdata-americas \
31 tzdata-asia \
32 tzdata-europe \
33 tzdata-posix \
34 python-pygobject \
35 python-dbus \
36 "
37
38RDEPENDS_${PN}-ptest_append_libc-glibc = "\
39 eglibc-gconv-utf-16 \
40 eglibc-charmap-utf-8 \
41 eglibc-gconv-cp1255 \
42 eglibc-charmap-cp1255 \
43 eglibc-gconv-utf-32 \
44 eglibc-gconv-utf-7 \
45 eglibc-charmap-invariant \
46 eglibc-localedata-translit-cjk-variants \
47 "
48EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
49
50do_configure_prepend() {
51 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
52}
53
54do_install_append() {
55 # remove some unpackaged files
56 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
57 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
58 # and empty dirs
59 rm -rf ${D}${libdir}/gio
60
61 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
62 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
63 if [ -f ${D}${bindir}/glib-mkenums ]; then
64 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
65 fi
66}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index ad0671a770..0698c29529 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -13,9 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
13BUGTRACKER = "http://bugzilla.gnome.org" 13BUGTRACKER = "http://bugzilla.gnome.org"
14SECTION = "libs" 14SECTION = "libs"
15 15
16DEPENDS = "glib-2.0-native virtual/libiconv" 16BBCLASSEXTEND = "native nativesdk"
17DEPENDS_class-native = "pkgconfig-native gettext-native" 17
18DEPENDS_class-nativesdk = "nativesdk-libtool" 18DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib"
19DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native"
20DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native"
19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" 21PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
20 22
21LEAD_SONAME = "libglib-2.0.*" 23LEAD_SONAME = "libglib-2.0.*"
@@ -30,8 +32,13 @@ CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap
30PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" 32PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}"
31EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" 33EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
32EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 34EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
35EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
36
37do_configure_prepend() {
38 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
39}
33 40
34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ 41FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas \
35 ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" 42 ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
36FILES_${PN}-dev += "${libdir}/glib-2.0/include \ 43FILES_${PN}-dev += "${libdir}/glib-2.0/include \
37 ${libdir}/gio/modules/lib*${SOLIBSDEV} \ 44 ${libdir}/gio/modules/lib*${SOLIBSDEV} \
@@ -50,4 +57,36 @@ USE_NLS = "yes"
50 57
51do_install_append () { 58do_install_append () {
52 sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python|' 59 sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python|'
60
61 # Remove some unpackaged files
62 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
63 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
64
65 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
66 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
67 if [ -f ${D}${bindir}/glib-mkenums ]; then
68 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
69 fi
53} 70}
71
72RDEPENDS_${PN}-ptest += "\
73 gnome-desktop-testing \
74 tzdata \
75 tzdata-americas \
76 tzdata-asia \
77 tzdata-europe \
78 tzdata-posix \
79 python-pygobject \
80 python-dbus \
81 "
82
83RDEPENDS_${PN}-ptest_append_libc-glibc = "\
84 eglibc-gconv-utf-16 \
85 eglibc-charmap-utf-8 \
86 eglibc-gconv-cp1255 \
87 eglibc-charmap-cp1255 \
88 eglibc-gconv-utf-32 \
89 eglibc-gconv-utf-7 \
90 eglibc-charmap-invariant \
91 eglibc-localedata-translit-cjk-variants \
92 "