From a7d5d6192d6d37c9748b7b992b50a79ec9f16fac Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 19 Jul 2012 15:04:36 +0100 Subject: gobject-introspection: cleanup thanks to new gtk-doc.bbclass (From OE-Core rev: 38284f890bbed3c3f24044bbae8c25da604ca187) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb | 11 ++++------- meta/recipes-gnome/gnome/gobject-introspection_git.bb | 11 +++-------- 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb index f51e83e3f4..2be10be500 100644 --- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +++ b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb @@ -3,6 +3,8 @@ DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native" DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native" BBCLASSEXTEND = "native" +PR = "r1" + SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" SRC_URI = "\ ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ @@ -17,15 +19,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" -inherit autotools +inherit autotools gtk-doc do_configure_prepend () { echo "EXTRA_DIST = " > ${S}/gtk-doc.make } -EXTRA_OECONF = "\ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-tests \ -" +EXTRA_OECONF = "--disable-tests" diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb index 83523845d8..1e0dd61cce 100644 --- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb +++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb @@ -13,21 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21" PV = "1.29.0+gitr${SRCPV}" +PR = "r1" + DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/git" -inherit autotools +inherit autotools gtk-doc BBCLASSEXTEND = "native" -do_configure_prepend () { - echo "EXTRA_DIST = " > ${S}/gtk-doc.make -} - EXTRA_OECONF = "\ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ --disable-tests \ " -- cgit v1.2.3-54-g00ecf