xkbcomp: upgrade from 1.2.0 to 1.2.1

- Also remove the cross compiling patch, since it is already included
 in 1.2.1 release

(From OE-Core rev: 67e5286b931df3207f9bb44cd58f8aafa8c80f96)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yu Ke 2011-04-09 22:27:12 +08:00 committed by Richard Purdie
parent 010cef64e4
commit 77d2110452
2 changed files with 2 additions and 38 deletions

View File

@ -1,35 +0,0 @@
commit cc55d8f5ab021861308b071aab9c03016be15187
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Oct 31 20:35:24 2010 -0400
config: replace AC_CHECK_FILE with test -f as it fails to cross-compile
Testing for the presence of xkbparse.c is legitimate as this is a build
file, but the Autoconf macro assumes it is testing on the host system
and fails.
Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index c69230b..8e6bd6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
+# If both the C file and YACC are missing, the package cannot be build.
AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC)
-AC_CHECK_FILE([$srcdir/xkbparse.c], [],
- [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
-
+if test ! -f "$srcdir/xkbparse.c"; then
+ if test -z "$YACC_INST"; then
+ AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
+ fi
+fi
AC_CHECK_FUNCS([strdup strcasecmp])

View File

@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
DEPENDS += "libxkbfile"
SRC_URI += "file://cross-compile-fix.patch"
SRC_URI[md5sum] = "885b4d8a7c8c7afb3312d31934cb3549"
SRC_URI[sha256sum] = "b7612527914402d091424a93bc16f0d4d8778b4a874171f3f3dc681c690e65eb"
BBCLASSEXTEND = "native"
SRC_URI[md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
SRC_URI[sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"