mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

goffice: fix gobject introspection

Browse Source 
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
This commit is contained in:
Alexander Kanavin
2016-02-22 19:16:24 +02:00
committed by Martin Jansa
parent 67d7b82064
commit 78645f999f
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch
+41
View File
@@ -0,0 +1,41 @@
From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 19 Feb 2016 16:04:24 +0200
Subject: [PATCH] configure.ac: fix paths to introspection tools
They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6d2b747..3b28463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then
dnl python where to find libgoffice, 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`
+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$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
@@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then
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
+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
else
INTROSPECTION_SCANNER=
INTROSPECTION_COMPILER=
--
2.7.0
meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
+3 -1
View File
@@ -5,10 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e"
DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool"
inherit gnomebase pkgconfig perlnative
inherit gnomebase pkgconfig perlnative gobject-introspection
GNOME_COMPRESS_TYPE = "xz"
SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch"
SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727"
SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0"