diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-09-26 09:15:00 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2011-09-27 17:40:02 -0700 |
commit | ae4ea40e52e5bcefd353221d4328acff352e295e (patch) | |
tree | 65f8273b73cee62309ab5f209c51b2ab89d81ed7 /meta-gnome | |
parent | 9826cc6fead485177bdf35f8d49d98feb2a318d7 (diff) | |
download | meta-openembedded-ae4ea40e52e5bcefd353221d4328acff352e295e.tar.gz |
gnome-power-manager: Fix build on gnome'less build systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch | 35 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb | 5 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch new file mode 100644 index 000000000..f3db7ab6e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch | |||
@@ -0,0 +1,35 @@ | |||
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 | ||
diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb index 9053e8c14..aeaf68891 100644 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb | |||
@@ -2,11 +2,14 @@ DESCRIPTION = "Power management daemon" | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
4 | 4 | ||
5 | PR = "r1" | 5 | PR = "r2" |
6 | 6 | ||
7 | DEPENDS = "glib-2.0 gtk+ gconf gnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower" | 7 | DEPENDS = "glib-2.0 gtk+ gconf gnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower" |
8 | 8 | ||
9 | inherit gnome | 9 | inherit gnome |
10 | |||
11 | SRC_URI += "file://sysrooted-pkg-config.patch" | ||
12 | |||
10 | SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" | 13 | SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" |
11 | SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" | 14 | SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" |
12 | 15 | ||