summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/vte/vte.inc4
-rw-r--r--meta/recipes-support/vte/vte/introspection.patch107
2 files changed, 1 insertions, 110 deletions
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 9fe79564d4..0766da7429 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -1,13 +1,11 @@
1DESCRIPTION = "vte is a virtual terminal emulator" 1DESCRIPTION = "vte is a virtual terminal emulator"
2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" 2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4DEPENDS = " glib-2.0 gtk+ intltool-native ncurses" 4DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
5RDEPENDS_libvte = "vte-termcap" 5RDEPENDS_libvte = "vte-termcap"
6 6
7inherit gnome gtk-doc 7inherit gnome gtk-doc
8 8
9SRC_URI += "file://introspection.patch"
10
11EXTRA_OECONF = "--disable-python --disable-introspection" 9EXTRA_OECONF = "--disable-python --disable-introspection"
12 10
13PACKAGES =+ "libvte vte-termcap" 11PACKAGES =+ "libvte vte-termcap"
diff --git a/meta/recipes-support/vte/vte/introspection.patch b/meta/recipes-support/vte/vte/introspection.patch
deleted file mode 100644
index 890ba310ed..0000000000
--- a/meta/recipes-support/vte/vte/introspection.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Get this m4 file from introspection, so that we can configure without
4depending on the introspection package.
5
6Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
72011/01/03
8
9Index: vte-0.28.2/m4/introspection.m4
10===================================================================
11--- /dev/null
12+++ vte-0.28.2/m4/introspection.m4
13@@ -0,0 +1,94 @@
14+dnl -*- mode: autoconf -*-
15+dnl Copyright 2009 Johan Dahlin
16+dnl
17+dnl This file is free software; the author(s) gives unlimited
18+dnl permission to copy and/or distribute it, with or without
19+dnl modifications, as long as this notice is preserved.
20+dnl
21+
22+# serial 1
23+
24+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
25+[
26+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
27+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
28+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
29+
30+ dnl enable/disable introspection
31+ m4_if([$2], [require],
32+ [dnl
33+ enable_introspection=yes
34+ ],[dnl
35+ AC_ARG_ENABLE(introspection,
36+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
37+ [Enable introspection for this build]),,
38+ [enable_introspection=auto])
39+ ])dnl
40+
41+ AC_MSG_CHECKING([for gobject-introspection])
42+
43+ dnl presence/version checking
44+ AS_CASE([$enable_introspection],
45+ [no], [dnl
46+ found_introspection="no (disabled, use --enable-introspection to enable)"
47+ ],dnl
48+ [yes],[dnl
49+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
50+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
51+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
52+ found_introspection=yes,
53+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
54+ ],dnl
55+ [auto],[dnl
56+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
57+ ],dnl
58+ [dnl
59+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
60+ ])dnl
61+
62+ AC_MSG_RESULT([$found_introspection])
63+
64+ INTROSPECTION_SCANNER=
65+ INTROSPECTION_COMPILER=
66+ INTROSPECTION_GENERATE=
67+ INTROSPECTION_GIRDIR=
68+ INTROSPECTION_TYPELIBDIR=
69+ if test "x$found_introspection" = "xyes"; then
70+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
71+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
72+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
73+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
74+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
75+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
76+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
77+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
78+ fi
79+ AC_SUBST(INTROSPECTION_SCANNER)
80+ AC_SUBST(INTROSPECTION_COMPILER)
81+ AC_SUBST(INTROSPECTION_GENERATE)
82+ AC_SUBST(INTROSPECTION_GIRDIR)
83+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
84+ AC_SUBST(INTROSPECTION_CFLAGS)
85+ AC_SUBST(INTROSPECTION_LIBS)
86+ AC_SUBST(INTROSPECTION_MAKEFILE)
87+
88+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
89+])
90+
91+
92+dnl Usage:
93+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
94+
95+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
96+[
97+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
98+])
99+
100+dnl Usage:
101+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
102+
103+
104+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
105+[
106+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
107+])