mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

glade3: initial add 3.8.2

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller
2012-09-28 06:35:49 +00:00
committed by Koen Kooi
parent 7eb2c6f845
commit c2a0882c52
2 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
+51
View File
@@ -0,0 +1,51 @@
From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 25 Sep 2012 10:28:33 +0200
Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
same approach as used used in gnome-disk-utility:
In cross environment we have to prepend the sysroot to the path found by
pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
it ends up using the files from host system. Now usually people have gnome installed
so the build succeeds but if you dont have gnome installed on build host then
it wont find the files on host system and packages using gnome-doc-utils wont
compile.
This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
will be empty
Upstream-Status: pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
gnome-doc-utils.make | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index 42d9df3..f71bbfa 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
_xml2po ?= `which xml2po`
_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
if ENABLE_SK
_ENABLE_SK = true
--
1.7.6.5