summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-10-25 10:39:21 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 16:08:38 +0100
commit95001f4d50d9868fc6c33fe1bf2a37fc99d365f9 (patch)
treeed39cd8e7a5baaba726f00643bc588a3b57a20a8
parentb82603b06276050b80c9ae643075dcb7efda352b (diff)
downloadpoky-95001f4d50d9868fc6c33fe1bf2a37fc99d365f9.tar.gz
libxcb: fix build with automake-1.14
(From OE-Core rev: f8c9a88082f5acf7835647a98a394d5a44fc556f) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch27
-rw-r--r--meta/recipes-graphics/xcb/libxcb_1.9.1.bb2
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch b/meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch
new file mode 100644
index 0000000000..0f1fc546d2
--- /dev/null
+++ b/meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch
@@ -0,0 +1,27 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libxcb-1.9.1/configure.ac libxcb-1.9.1/configure.ac
5--- libxcb-1.9.1/configure.ac 2013-05-30 18:38:01.000000000 +0300
6+++ libxcb-1.9.1/configure.ac 2013-10-24 23:15:10.542507543 +0300
7@@ -7,15 +7,16 @@
8 1.9.1,
9 [xcb@lists.freedesktop.org])
10 AC_CONFIG_SRCDIR([xcb.pc.in])
11-# Set common system defines for POSIX extensions, such as _GNU_SOURCE
12-# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
13-# to avoid autoconf errors.
14-AC_USE_SYSTEM_EXTENSIONS
15
16 # Initialize Automake
17 AM_INIT_AUTOMAKE([foreign dist-bzip2])
18 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
19
20+# Set common system defines for POSIX extensions, such as _GNU_SOURCE
21+# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
22+# to avoid autoconf errors.
23+AC_USE_SYSTEM_EXTENSIONS
24+
25 AM_PATH_PYTHON([2.6])
26
27 PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
diff --git a/meta/recipes-graphics/xcb/libxcb_1.9.1.bb b/meta/recipes-graphics/xcb/libxcb_1.9.1.bb
index a40a1c1de5..b6548003de 100644
--- a/meta/recipes-graphics/xcb/libxcb_1.9.1.bb
+++ b/meta/recipes-graphics/xcb/libxcb_1.9.1.bb
@@ -3,7 +3,7 @@ include libxcb.inc
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
5 5
6PR = "r0" 6SRC_URI += "file://automake_1.14_fix.patch"
7 7
8DEPENDS += "libxdmcp" 8DEPENDS += "libxdmcp"
9 9