aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-lib
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2010-02-10 23:24:13 +0000
committerutx@penguin.cz <utx@penguin.cz>2010-02-10 23:24:13 +0000
commit4af92512ba4b72b3d901b571c2b5004b7e999537 (patch)
tree5caccc17a6776bfd4e7fa9b0c9f208d6dc21139e /recipes/xorg-lib
parente65f002a8770e7468d7d2a5e1a9e8dad29b5cb7b (diff)
downloadopenembedded-4af92512ba4b72b3d901b571c2b5004b7e999537.tar.gz
libx11: Apply keysymdef_include.patch referring to target staging only for libx11 and not for libx11-native.
Diffstat (limited to 'recipes/xorg-lib')
-rw-r--r--recipes/xorg-lib/libx11_1.3.3.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index e70716a96d..f6ea1411ef 100644
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -5,15 +5,16 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
PROVIDES = "virtual/libx11"
PE = "1"
-PR = "r6"
+PR = "r7"
XORG_PN = "libX11"
SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
file://dolt-fix.patch;patch=1 \
- file://keysymdef_include.patch;patch=1 \
+ ${@['file://keysymdef_include.patch;patch=1', ''][(bb.data.inherits_class('native', d))]} \
"
+# --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch
EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
do_compile() {