summaryrefslogtreecommitdiffstats
path: root/meta
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:02:42 +0100
commitf8c9a88082f5acf7835647a98a394d5a44fc556f (patch)
tree8cc98af36f43edfc64cc2de976182bb48911d5b0 /meta
parent37e70a28e9cfc773bd70f09d7129295ce891ae18 (diff)
downloadopenembedded-core-f8c9a88082f5acf7835647a98a394d5a44fc556f.tar.gz
libxcb: fix build with automake-1.14
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@
+Upstream-Status: Backport
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libxcb-1.9.1/configure.ac libxcb-1.9.1/configure.ac
+--- libxcb-1.9.1/configure.ac 2013-05-30 18:38:01.000000000 +0300
++++ libxcb-1.9.1/configure.ac 2013-10-24 23:15:10.542507543 +0300
+@@ -7,15 +7,16 @@
+ 1.9.1,
+ [xcb@lists.freedesktop.org])
+ AC_CONFIG_SRCDIR([xcb.pc.in])
+-# Set common system defines for POSIX extensions, such as _GNU_SOURCE
+-# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
+-# to avoid autoconf errors.
+-AC_USE_SYSTEM_EXTENSIONS
+
+ # Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
++# Set common system defines for POSIX extensions, such as _GNU_SOURCE
++# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
++# to avoid autoconf errors.
++AC_USE_SYSTEM_EXTENSIONS
++
+ AM_PATH_PYTHON([2.6])
+
+ 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
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
-PR = "r0"
+SRC_URI += "file://automake_1.14_fix.patch"
DEPENDS += "libxdmcp"