Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +----
meta/recipes-core/glib-2.0/glib.inc | 6 +++---
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 1f8ad7d..988494b 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 @@
require glib.inc
-PR = "r2"
+PR = "r3"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
@@ -23,9 +23,6 @@ SRC_URI_append_virtclass-native = "
file://glib-gettextize-dir.patch"
BBCLASSEXTEND = "native nativesdk"
do_configure_prepend() {
- # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough,
because it calls gtkdocize (not provided by gtk-doc-native)
- sed -i '/^docs/d' ${S}/configure.ac
- 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
sed -i -e "s:TEST_PROGS += gdbus-serialization::g"
${S}/gio/tests/Makefile.am
sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,'
${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
}
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 2f48e27..3540cd5 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 \
BUGTRACKER = "http://bugzilla.gnome.org";
SECTION = "libs"
-DEPENDS = "glib-2.0-native gtk-doc-native zip virtual/libiconv"
-DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
+DEPENDS = "glib-2.0-native zip virtual/libiconv"
+DEPENDS_virtclass-native = "pkgconfig-native gettext-native"
DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
LEAD_SONAME = "libglib-2.0.*"
FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
-inherit autotools pkgconfig gettext
+inherit autotools gettext gtk-doc pkgconfig
S = "${WORKDIR}/glib-${PV}"
--
1.7.10
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
