summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-19 12:27:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-22 11:42:16 +0100
commit1f9c1333d5f739e3121fbfe1b18489406c2e446f (patch)
treef00cbf3f7490f8f6a8fbf827314c09caf5fe4289 /meta
parent8744139f1256bf0cc4a6207fa4f5562741322416 (diff)
downloadpoky-1f9c1333d5f739e3121fbfe1b18489406c2e446f.tar.gz
glib-2.0: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 8ef2d4f78982a664c5363d0fe17eb69487a5fa12) 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.32.4.bb5
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc6
2 files changed, 4 insertions, 7 deletions
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 1f8ad7d0a7..988494b426 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 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r2" 3PR = "r3"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
@@ -23,9 +23,6 @@ SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
23BBCLASSEXTEND = "native nativesdk" 23BBCLASSEXTEND = "native nativesdk"
24 24
25do_configure_prepend() { 25do_configure_prepend() {
26 # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
27 sed -i '/^docs/d' ${S}/configure.ac
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
29 sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am 26 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 27 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
31} 28}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 2f48e27f0e..3540cd5769 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -13,15 +13,15 @@ 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 gtk-doc-native zip virtual/libiconv" 16DEPENDS = "glib-2.0-native zip virtual/libiconv"
17DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native" 17DEPENDS_virtclass-native = "pkgconfig-native gettext-native"
18DEPENDS_virtclass-nativesdk = "libtool-nativesdk" 18DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" 19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
20 20
21LEAD_SONAME = "libglib-2.0.*" 21LEAD_SONAME = "libglib-2.0.*"
22FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" 22FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
23 23
24inherit autotools pkgconfig gettext 24inherit autotools gettext gtk-doc pkgconfig
25 25
26S = "${WORKDIR}/glib-${PV}" 26S = "${WORKDIR}/glib-${PV}"
27 27