Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 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-power-manager-2.32.0/gnome-doc-utils.make |
| 16 | =================================================================== |
| 17 | --- gnome-power-manager-2.32.0.orig/gnome-doc-utils.make 2010-01-27 08:28:31.000000000 -0800 |
| 18 | +++ gnome-power-manager-2.32.0/gnome-doc-utils.make 2011-09-25 16:16:04.914813800 -0700 |
| 19 | @@ -124,11 +124,11 @@ |
| 20 | |
| 21 | _xml2po ?= `which xml2po` |
| 22 | |
| 23 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` |
| 24 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` |
| 25 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl |
| 26 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl |
| 27 | -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl |
| 28 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` |
| 29 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` |
| 30 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl |
| 31 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl |
| 32 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl |
| 33 | |
| 34 | if ENABLE_SK |
| 35 | _ENABLE_SK = true |