diff options
Diffstat (limited to 'meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch')
-rw-r--r-- | meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch new file mode 100644 index 0000000000..e17e8b4ec3 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | In cross environment we have to prepend the sysroot to the path found by | ||
2 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
3 | it ends up using the files from host system. Now usually people have gnome installed | ||
4 | so the build succeeds but if you dont have gnome installed on build host then | ||
5 | it wont find the files on host system and packages using gnome-doc-utils wont | ||
6 | compile. | ||
7 | |||
8 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
9 | will be empty | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | Index: gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make | ||
16 | =================================================================== | ||
17 | --- gnome-doc-utils-0.20.6.orig/tools/gnome-doc-utils.make 2011-09-23 22:22:26.000000000 -0700 | ||
18 | +++ gnome-doc-utils-0.20.6/tools/gnome-doc-utils.make 2011-09-23 22:30:03.479787196 -0700 | ||
19 | @@ -133,12 +133,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ | ||
20 | _xml2po ?= `which xml2po` | ||
21 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
22 | |||
23 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
24 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
25 | -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
26 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
27 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
28 | -_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
29 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
30 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
31 | +_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
32 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
33 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
34 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
35 | |||
36 | if ENABLE_SK | ||
37 | _ENABLE_SK = true | ||