mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 13:59:59 +00:00
libgsf: fix gobject introspection
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
This commit is contained in:
Alexander Kanavin
committed by
Martin Jansa
Martin Jansa
parent
ae08ee70a4
commit
1c99f9ac69
+103
@@ -0,0 +1,103 @@
|
|||||||
|
From 16d2c2e74350fda5505982fb150e72af7aee7454 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
Date: Fri, 19 Feb 2016 16:23:56 +0200
|
||||||
|
Subject: [PATCH] configure.ac: drop a copy-paste of introspection.m4 macros
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
---
|
||||||
|
configure.ac | 78 +-----------------------------------------------------------
|
||||||
|
1 file changed, 1 insertion(+), 77 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 54f7663..3038535 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -77,83 +77,7 @@ libgsf_reqs="
|
||||||
|
"
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
|
||||||
|
-# GObject Introspection
|
||||||
|
-GIR_REQ=1.0.0
|
||||||
|
-AC_ARG_ENABLE(introspection,
|
||||||
|
- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
|
||||||
|
- [Enable introspection for this build]),,
|
||||||
|
- [enable_introspection=no])
|
||||||
|
-
|
||||||
|
-AC_MSG_CHECKING([for gobject-introspection])
|
||||||
|
-
|
||||||
|
-dnl presence/version checking
|
||||||
|
-AS_CASE([$enable_introspection],
|
||||||
|
-[no], [
|
||||||
|
- found_introspection="no (disabled, use --enable-introspection to enable)"
|
||||||
|
-],
|
||||||
|
-[yes],[
|
||||||
|
- PKG_CHECK_EXISTS([gobject-introspection-1.0],,
|
||||||
|
- AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
|
||||||
|
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ],
|
||||||
|
- found_introspection=yes,
|
||||||
|
- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
|
||||||
|
-],
|
||||||
|
-[auto],[
|
||||||
|
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no)
|
||||||
|
-dnl Canonicalize enable_introspection
|
||||||
|
-enable_introspection=$found_introspection
|
||||||
|
-],
|
||||||
|
-[
|
||||||
|
- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
|
||||||
|
-])
|
||||||
|
-
|
||||||
|
-AC_MSG_RESULT([$found_introspection])
|
||||||
|
-
|
||||||
|
-if test "x$found_introspection" = "xyes"; then
|
||||||
|
- dnl You can override INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR
|
||||||
|
- dnl if you wish. If you override the latter, you might want to set
|
||||||
|
- dnl GI_TYPELIB_PATH to include the same directory. For example
|
||||||
|
- dnl
|
||||||
|
- dnl GI_TYPELIB_PATH=$PREFIX/lib64/girepository-1.0
|
||||||
|
- dnl INTROSPECTION_TYPELIBDIR=$GI_TYPELIB_PATH
|
||||||
|
- dnl INTROSPECTION_GIRDIR=$PREFIX/share/gir-1.0
|
||||||
|
- dnl
|
||||||
|
- dnl Note, that unlike binaries produced with libgsf, nothing tells
|
||||||
|
- dnl python where to find libgsf, so you might also need to set
|
||||||
|
- dnl LD_LIBRARY_PATH.
|
||||||
|
-
|
||||||
|
- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
|
||||||
|
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||||
|
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||||
|
- if test "x$INTROSPECTION_GIRDIR" = x; then
|
||||||
|
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||||||
|
- fi
|
||||||
|
- if test "x$INTROSPECTION_TYPELIBDIR" = x; then
|
||||||
|
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
||||||
|
- fi
|
||||||
|
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
|
||||||
|
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
|
||||||
|
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
|
||||||
|
-else
|
||||||
|
- INTROSPECTION_SCANNER=
|
||||||
|
- INTROSPECTION_COMPILER=
|
||||||
|
- INTROSPECTION_GENERATE=
|
||||||
|
- INTROSPECTION_GIRDIR=
|
||||||
|
- INTROSPECTION_TYPELIBDIR=
|
||||||
|
- INTROSPECTION_CFLAGS=
|
||||||
|
- INTROSPECTION_LIBS=
|
||||||
|
- INTROSPECTION_MAKEFILE=
|
||||||
|
-fi
|
||||||
|
-AC_SUBST(INTROSPECTION_SCANNER)
|
||||||
|
-AC_SUBST(INTROSPECTION_COMPILER)
|
||||||
|
-AC_SUBST(INTROSPECTION_GENERATE)
|
||||||
|
-AC_SUBST(INTROSPECTION_GIRDIR)
|
||||||
|
-AC_SUBST(INTROSPECTION_TYPELIBDIR)
|
||||||
|
-AC_SUBST(INTROSPECTION_CFLAGS)
|
||||||
|
-AC_SUBST(INTROSPECTION_LIBS)
|
||||||
|
-AC_SUBST(INTROSPECTION_MAKEFILE)
|
||||||
|
-
|
||||||
|
-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
|
||||||
|
+GOBJECT_INTROSPECTION_CHECK([1.46.0])
|
||||||
|
dnl we need to change the install directories for distcheck
|
||||||
|
AC_ARG_WITH([gir-dir],
|
||||||
|
AS_HELP_STRING(
|
||||||
|
--
|
||||||
|
2.7.0
|
||||||
|
|
||||||
@@ -7,7 +7,9 @@ SECTION = "libs"
|
|||||||
|
|
||||||
DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
|
DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
|
||||||
|
|
||||||
inherit autotools pkgconfig gnome gconf
|
inherit autotools pkgconfig gnome gconf gobject-introspection
|
||||||
|
|
||||||
|
SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
|
||||||
|
|
||||||
SRC_URI[archive.md5sum] = "3056b94bb3281dbc8311371bfc23cf72"
|
SRC_URI[archive.md5sum] = "3056b94bb3281dbc8311371bfc23cf72"
|
||||||
SRC_URI[archive.sha256sum] = "4d8bca33424eb711acdb6a060cb488b132063d699c4fa201db24c2c89c62529c"
|
SRC_URI[archive.sha256sum] = "4d8bca33424eb711acdb6a060cb488b132063d699c4fa201db24c2c89c62529c"
|
||||||
|
|||||||
Reference in New Issue
Block a user