diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-07-16 10:25:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:53:59 +0100 |
commit | 0e53886ced4364271d5561433d02b75063599b27 (patch) | |
tree | 776269da5529af4ed1cc6f99c72ea24c160a3fd9 /meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | |
parent | d627534e0f44db2bc07023c51236696051e0f223 (diff) | |
download | poky-0e53886ced4364271d5561433d02b75063599b27.tar.gz |
libx11: fix makekeys build
* on hosts without libx11 installed it fails with
| makekeys.c:33:27: fatal error: X11/Xresource.h: No such file or directory
since oe-core rev 52d4ff7b35602faa52360a3e7a800891ef60c739
* upstream added -I$(top_srcdir)/include in 24283d40b1e4314c6647dda49d2a159833341a8b
to ensure that right Xresource.h version is used, but we're building
makekeys outside source tree (x11_disable_makekeys.patch), so we need
to pass -I${S}/include in our makekeys build too
* building makekeys outside source tree isn't probably needed anymore
and recipes should be updated to reflect that, upstream fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=22584
http://cgit.freedesktop.org/xorg/lib/libX11/commit/src/util/Makefile.am?id=b2487d07f7b355f230a56e32c763acd08862735c
http://cgit.freedesktop.org/xorg/lib/libX11/commit/src/util/Makefile.am?id=24283d40b1e4314c6647dda49d2a159833341a8b
(From OE-Core rev: abdc37d181019b9dd21ad08ad998ea4ff2a3e264)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 04805d74f4..a65ab1faad 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require libx11.inc | 1 | require libx11.inc |
2 | inherit gettext | 2 | inherit gettext |
3 | 3 | ||
4 | PR = "r0" | 4 | PR = "r1" |
5 | 5 | ||
6 | BBCLASSEXTEND = "native nativesdk" | 6 | BBCLASSEXTEND = "native nativesdk" |
7 | 7 | ||