diff options
Diffstat (limited to 'meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch')
-rw-r--r-- | meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file mode 100644 index 000000000..1b24c39ce --- /dev/null +++ b/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 25 Sep 2012 10:28:33 +0200 | ||
4 | Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | same approach as used used in gnome-disk-utility: | ||
10 | |||
11 | In cross environment we have to prepend the sysroot to the path found by | ||
12 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
13 | it ends up using the files from host system. Now usually people have gnome installed | ||
14 | so the build succeeds but if you dont have gnome installed on build host then | ||
15 | it wont find the files on host system and packages using gnome-doc-utils wont | ||
16 | compile. | ||
17 | |||
18 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
19 | will be empty | ||
20 | |||
21 | Upstream-Status: pending | ||
22 | |||
23 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
24 | --- | ||
25 | gnome-doc-utils.make | 10 +++++----- | ||
26 | 1 files changed, 5 insertions(+), 5 deletions(-) | ||
27 | |||
28 | diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make | ||
29 | index 42d9df3..f71bbfa 100644 | ||
30 | --- a/gnome-doc-utils.make | ||
31 | +++ b/gnome-doc-utils.make | ||
32 | @@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ | ||
33 | _xml2po ?= `which xml2po` | ||
34 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
35 | |||
36 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
37 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
38 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
39 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
40 | -_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
41 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
42 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
43 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
44 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
45 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
46 | |||
47 | if ENABLE_SK | ||
48 | _ENABLE_SK = true | ||
49 | -- | ||
50 | 1.7.6.5 | ||
51 | |||