libx11: fix makekeys build
authorMartin Jansa <martin.jansa@gmail.com>
Mon, 16 Jul 2012 08:25:49 +0000 (10:25 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 17 Jul 2012 09:53:59 +0000 (10:53 +0100)
commit64f0fca59317a99c5db46e3699f40c29e6dc1d85
treeb742def2f153fbb937ad14985dfe971a03225e06
parent8de91da95b3fd232316331e8fd6841dfa9a92211
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>
meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
meta/recipes-graphics/xorg-lib/libx11.inc
meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb