[oe-commits] Stanislav Brabec : libx11: Apply keysymdef_include. patch referring to target staging only for libx11 and not for libx11-native .
git version control
git at git.openembedded.org
Wed Feb 10 23:26:07 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4af92512ba4b72b3d901b571c2b5004b7e999537
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4af92512ba4b72b3d901b571c2b5004b7e999537
Author: Stanislav Brabec <utx at penguin.cz>
Date: Wed Feb 10 23:24:13 2010 +0000
libx11: Apply keysymdef_include.patch referring to target staging only for libx11 and not for libx11-native.
---
recipes/xorg-lib/libx11_1.3.3.bb | 5 +++--
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 e70716a..f6ea141 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() {
More information about the Openembedded-commits
mailing list