summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-07-16 10:25:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:59 +0100
commit0e53886ced4364271d5561433d02b75063599b27 (patch)
tree776269da5529af4ed1cc6f99c72ea24c160a3fd9
parentd627534e0f44db2bc07023c51236696051e0f223 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc4
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb2
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 4ae8b29a7f..7d4facdb05 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -5,7 +5,7 @@ this version."
5 5
6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
7 7
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI += "file://x11_disable_makekeys.patch \ 10SRC_URI += "file://x11_disable_makekeys.patch \
11 file://X18NCMSstubs.diff \ 11 file://X18NCMSstubs.diff \
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 89c45974f3..3d5a306a17 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
5LICENSE = "MIT & MIT-style & BSD" 5LICENSE = "MIT & MIT-style & BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
7 7
8PR = "r0" 8PR = "r1"
9 9
10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
11 11
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index a1e4386feb..592f116532 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -35,9 +35,9 @@ do_compile_prepend() {
35 sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c 35 sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
36 touch makekeys-makekeys.o; 36 touch makekeys-makekeys.o;
37 if [ "${SITEINFO_BITS}" == "64" ]; then 37 if [ "${SITEINFO_BITS}" == "64" ]; then
38 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys 38 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -I${S}/include -o makekeys
39 else 39 else
40 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys 40 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -I${S}/include -o makekeys
41 fi 41 fi
42 ) 42 )
43 if [ "$?" != "0" ]; then 43 if [ "$?" != "0" ]; then
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 @@
1require libx11.inc 1require libx11.inc
2inherit gettext 2inherit gettext
3 3
4PR = "r0" 4PR = "r1"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7