Patchwork [1/4] libxcb: fix build with automake-1.14

login
register
mail settings
Submitter Marko Lindqvist
Date Oct. 25, 2013, 7:39 a.m.
Message ID <b4d752157bb874d686fb25ae43e4dc499596c22c.1382686685.git.cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/60505/
State Accepted
Commit 95001f4d50d9868fc6c33fe1bf2a37fc99d365f9
Headers show

Comments

Marko Lindqvist - Oct. 25, 2013, 7:39 a.m.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../xcb/libxcb/automake_1.14_fix.patch             | 27 ++++++++++++++++++++++
 meta/recipes-graphics/xcb/libxcb_1.9.1.bb          |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xcb/libxcb/automake_1.14_fix.patch

Patch

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 0000000..0f1fc54
--- /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 a40a1c1..b654800 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"