diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-09-26 09:13:28 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2011-09-27 17:40:02 -0700 |
commit | 9826cc6fead485177bdf35f8d49d98feb2a318d7 (patch) | |
tree | 102c51b2467b2ed86d3ca4545b022a4fae3d2419 /meta-gnome | |
parent | 1dd63580daf20e9c96433d4b4f5b673baa3be29b (diff) | |
download | meta-openembedded-9826cc6fead485177bdf35f8d49d98feb2a318d7.tar.gz |
gdm: 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/gdm/gdm-2.32.2/sysrooted-pkg-config.patch | 37 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/sysrooted-pkg-config.patch new file mode 100644 index 000000000..1f9fa2ac2 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/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: gdm-2.32.2/gnome-doc-utils.make | ||
16 | =================================================================== | ||
17 | --- gdm-2.32.2.orig/gnome-doc-utils.make 2011-05-31 08:06:59.000000000 -0700 | ||
18 | +++ gdm-2.32.2/gnome-doc-utils.make 2011-09-25 15:32:39.540992521 -0700 | ||
19 | @@ -133,12 +133,12 @@ | ||
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 | ||
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb index 6fcea0d5c..b1cbf457a 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | |||
@@ -4,13 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
4 | 4 | ||
5 | DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" | 5 | DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" |
6 | 6 | ||
7 | PR = "r4" | 7 | PR = "r5" |
8 | 8 | ||
9 | inherit gnome update-rc.d | 9 | inherit gnome update-rc.d |
10 | 10 | ||
11 | SRC_URI += " \ | 11 | SRC_URI += " \ |
12 | file://cross-xdetection.diff \ | 12 | file://cross-xdetection.diff \ |
13 | file://0001-Remove-user-switch-applet.patch \ | 13 | file://0001-Remove-user-switch-applet.patch \ |
14 | file://sysrooted-pkg-config.patch \ | ||
14 | file://%gconf-tree.xml \ | 15 | file://%gconf-tree.xml \ |
15 | file://gdm \ | 16 | file://gdm \ |
16 | file://gdm.conf \ | 17 | file://gdm.conf \ |