diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch deleted file mode 100644 index 8c50bb7262..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d45b3fc19fbe95c41afc4e51d768df6d42332010 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 12 Sep 2012 13:39:40 +0000 -Subject: Allow overriding location of keysymdef.h - -Currently keysymdef.h is found by using the includedir of xproto. This doesn't -work when cross-compiling with a sysroot as that ends up being /usr/include/X11, -not a path into the cross-build environment. - -So, add an option to allow explicitly specifying the location of keysymdef.h, -and verify that the specified or found path exists. - -(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself) - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> -Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> -Reviewed-by: Daniel Stone <daniel@fooishbar.org> ---- -diff --git a/configure.ac b/configure.ac -index 48a0c8a..a45f9d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH([keysymdefdir], -+ [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], -+ [KEYSYMDEFDIR=$withval], -+ [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) -+ -+if test ! -d "$KEYSYMDEFDIR"; then -+ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then --- -cgit v0.9.0.2-2-gbebe |