diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-27 11:40:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-28 09:20:53 +0100 |
commit | 17a07be20e7f322cca1673e3c5c45c66f8c65cb9 (patch) | |
tree | b301363324b01e6f987311901ecee958f4ec5aa4 /meta | |
parent | e496e3df23d2488f7ccee2f2856286c5db286f29 (diff) | |
download | poky-17a07be20e7f322cca1673e3c5c45c66f8c65cb9.tar.gz |
gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
(From OE-Core rev: cc95d5472936f24f8375f4366062606595dd8124)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
5 files changed, 1 insertions, 80 deletions
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc index f7c222e6ad..ab0c2dc863 100644 --- a/meta/conf/distro/include/world-broken.inc +++ b/meta/conf/distro/include/world-broken.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Exclude known broken packages | 2 | # Exclude known broken packages |
3 | # | 3 | # |
4 | EXCLUDE_FROM_WORLD_pn-gobject-introspection = "1" | 4 | |
5 | 5 | ||
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 12005894e7..6a3fa54769 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
@@ -198,7 +198,6 @@ BBCLASSEXTEND_append_pn-gnome-terminal = " ${MULTILIBS}" | |||
198 | BBCLASSEXTEND_append_pn-gnu-config = " ${MULTILIBS}" | 198 | BBCLASSEXTEND_append_pn-gnu-config = " ${MULTILIBS}" |
199 | BBCLASSEXTEND_append_pn-gnupg = " ${MULTILIBS}" | 199 | BBCLASSEXTEND_append_pn-gnupg = " ${MULTILIBS}" |
200 | BBCLASSEXTEND_append_pn-gnutls = " ${MULTILIBS}" | 200 | BBCLASSEXTEND_append_pn-gnutls = " ${MULTILIBS}" |
201 | BBCLASSEXTEND_append_pn-gobject-introspection = " ${MULTILIBS}" | ||
202 | BBCLASSEXTEND_append_pn-gperf = " ${MULTILIBS}" | 201 | BBCLASSEXTEND_append_pn-gperf = " ${MULTILIBS}" |
203 | BBCLASSEXTEND_append_pn-gpgme = " ${MULTILIBS}" | 202 | BBCLASSEXTEND_append_pn-gpgme = " ${MULTILIBS}" |
204 | BBCLASSEXTEND_append_pn-grep = " ${MULTILIBS}" | 203 | BBCLASSEXTEND_append_pn-grep = " ${MULTILIBS}" |
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch deleted file mode 100644 index ea00157d46..0000000000 --- a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in | ||
4 | =================================================================== | ||
5 | --- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in | ||
6 | +++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in | ||
7 | @@ -1,4 +1,4 @@ | ||
8 | -#!@PYTHON@ | ||
9 | +#!/usr/bin/env python | ||
10 | # -*- Mode: Python -*- | ||
11 | # GObject-Introspection - a framework for introspecting GObject libraries | ||
12 | # Copyright (C) 2008 Johan Dahlin | ||
13 | Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in | ||
14 | =================================================================== | ||
15 | --- gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in | ||
16 | +++ gobject-introspection-0.9.10/tools/g-ir-scanner.in | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -#!@PYTHON@ | ||
19 | +#!/usr/bin/env python | ||
20 | # -*- Mode: Python -*- | ||
21 | # GObject-Introspection - a framework for introspecting GObject libraries | ||
22 | # Copyright (C) 2008 Johan Dahlin | ||
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb deleted file mode 100644 index 8f5ca565cb..0000000000 --- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | # NOTE: WIP! This recipe does not cross-compile atm., only -native | ||
2 | DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native" | ||
3 | DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native" | ||
4 | BBCLASSEXTEND = "native" | ||
5 | |||
6 | PR = "r1" | ||
7 | |||
8 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | ||
9 | SRC_URI = "\ | ||
10 | ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ | ||
11 | file://use-usr-bin-env-for-python.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "7bbdb696c37bb98aef5af02c4b8975e3" | ||
15 | SRC_URI[sha256sum] = "44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858" | ||
16 | |||
17 | LICENSE = "GPLv2+ & LGPLv2+" | ||
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ | ||
19 | file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
20 | file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
21 | |||
22 | inherit autotools gtk-doc pythonnative | ||
23 | |||
24 | do_configure_prepend () { | ||
25 | echo "EXTRA_DIST = " > ${S}/gtk-doc.make | ||
26 | } | ||
27 | |||
28 | EXTRA_OECONF = "--disable-tests" | ||
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb deleted file mode 100644 index 8a9aa14867..0000000000 --- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | # NOTE: WIP! This recipe does not cross-compile atm., only -native | ||
2 | DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native" | ||
3 | DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native" | ||
4 | BBCLASSEXTEND = "native" | ||
5 | |||
6 | SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \ | ||
7 | file://use-usr-bin-env-for-python.patch \ | ||
8 | " | ||
9 | |||
10 | LICENSE = "GPLv2+ & LGPLv2+" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
12 | file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
13 | |||
14 | SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21" | ||
15 | PV = "1.29.0+gitr${SRCPV}" | ||
16 | PR = "r1" | ||
17 | |||
18 | DEFAULT_PREFERENCE = "-1" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | |||
22 | inherit autotools gtk-doc pythonnative | ||
23 | |||
24 | BBCLASSEXTEND = "native" | ||
25 | |||
26 | EXTRA_OECONF = "\ | ||
27 | --disable-tests \ | ||
28 | " | ||