summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-04-09 22:27:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-18 05:49:38 +0100
commit77d2110452576f6164b17cc9bd8b6baf8027b7d2 (patch)
tree8f20430d562c7e31c2263e57ebab6cb919529ade
parent010cef64e4b8cc54cdbd64efa96aa03d5a46218c (diff)
downloadpoky-77d2110452576f6164b17cc9bd8b6baf8027b7d2.tar.gz
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>
-rw-r--r--meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch35
-rw-r--r--meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb (renamed from meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb)5
2 files changed, 2 insertions, 38 deletions
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
deleted file mode 100644
index ca65345636..0000000000
--- a/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1commit cc55d8f5ab021861308b071aab9c03016be15187
2Author: Gaetan Nadon <memsize@videotron.ca>
3Date: Sun Oct 31 20:35:24 2010 -0400
4
5 config: replace AC_CHECK_FILE with test -f as it fails to cross-compile
6
7 Testing for the presence of xkbparse.c is legitimate as this is a build
8 file, but the Autoconf macro assumes it is testing on the host system
9 and fails.
10
11 Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
12 Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
13
14diff --git a/configure.ac b/configure.ac
15index c69230b..8e6bd6e 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS
19
20 AM_CONFIG_HEADER(config.h)
21
22+# If both the C file and YACC are missing, the package cannot be build.
23 AC_PROG_YACC
24 AC_PATH_PROG([YACC_INST], $YACC)
25-AC_CHECK_FILE([$srcdir/xkbparse.c], [],
26- [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
27-
28+if test ! -f "$srcdir/xkbparse.c"; then
29+ if test -z "$YACC_INST"; then
30+ AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
31+ fi
32+fi
33
34 AC_CHECK_FUNCS([strdup strcasecmp])
35
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb
index f574690898..0cf334adb9 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.1.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
11 11
12DEPENDS += "libxkbfile" 12DEPENDS += "libxkbfile"
13 13
14SRC_URI += "file://cross-compile-fix.patch" 14SRC_URI[md5sum] = "885b4d8a7c8c7afb3312d31934cb3549"
15SRC_URI[sha256sum] = "b7612527914402d091424a93bc16f0d4d8778b4a874171f3f3dc681c690e65eb"
15 16
16BBCLASSEXTEND = "native" 17BBCLASSEXTEND = "native"
17 18
18SRC_URI[md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
19SRC_URI[sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"