summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-01-14 12:18:50 +0800
committerSaul Wold <sgw@linux.intel.com>2011-01-18 07:38:02 -0800
commit75e9e0af7ad224c46fc66a268ea7a6c44167f132 (patch)
treeb2087b5d428a7bcf1a86502c09cc2172f95aa4c1 /meta
parenta447c328dc27bb32b871758efef12f717f446ea2 (diff)
downloadpoky-75e9e0af7ad224c46fc66a268ea7a6c44167f132.tar.gz
xkbcomp: upgrade to 1.2.0
- also pick one patch from upstream to fix the cross compiling error during the do_configure. it can be safely removed in the next upgrade. Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch35
-rw-r--r--meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb (renamed from meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb)6
2 files changed, 39 insertions, 2 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
new file mode 100644
index 0000000000..ca65345636
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xkbcomp/cross-compile-fix.patch
@@ -0,0 +1,35 @@
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.1.1.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
index bd40e4287d..b8592fa470 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.2.0.bb
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
8 8
9DEPENDS += "libxkbfile" 9DEPENDS += "libxkbfile"
10 10
11SRC_URI += "file://cross-compile-fix.patch"
12
11BBCLASSEXTEND = "native" 13BBCLASSEXTEND = "native"
12 14
13SRC_URI[md5sum] = "38c387bacdc01038c8ac280588792bcf" 15SRC_URI[md5sum] = "0f55995cd8da9b2d88553e1a2e17cd0a"
14SRC_URI[sha256sum] = "9775bcfd43d9ffa41e2865e5b2c933f419bf983d7a529b3103656c76fd82e663" 16SRC_URI[sha256sum] = "2c64aa414755e764ca548ae5c93e95f7b5bbd5e01bca16bf226fd32bfae77ea4"