summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2016-08-09 16:36:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:34 +0100
commit87cb470304dce720a1723f81b327dc06332fd147 (patch)
tree8cd1c48745f2f71926fcfff2e4ad25865a54fb83 /meta/recipes-core/dbus
parent5aca5bc9a13d9d4a477cfd2d04edbcc8a8a0e412 (diff)
downloadpoky-87cb470304dce720a1723f81b327dc06332fd147.tar.gz
dbus: backport stdint.h build fix
This patch fixes an error where dbus configure doesn't detect stdint.h correctly. Upstream commit 1bfde222 on branches dbus-1.10 and master (From OE-Core rev: 5ed0d5a7d9b051a551a6de644bf6a42b87c12471) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus')
-rw-r--r--meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch38
-rw-r--r--meta/recipes-core/dbus/dbus_1.10.8.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch b/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch
new file mode 100644
index 0000000000..85acb7b1ca
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch
@@ -0,0 +1,38 @@
1From 1bfde222926be624a30a6e4b2cdc2c5064a36298 Mon Sep 17 00:00:00 2001
2From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
3Date: Fri, 29 Jul 2016 01:19:37 +0300
4Subject: [PATCH] configure.ac: explicitely check stdint.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Otherwise HAVE_STDINT_H will not be defined or the var will not be
10picked up from cache so builds could fail with errors like:
11| ../../dbus-1.10.8/dbus/dbus-internals.h:239:8: error: ‘uintptr_t’ undeclared (first use in this function)
12
13Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
14[smcv: fix Autoconf underquoting]
15Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
16
17Upstream-Status: Backport [from dbus-1.10]
18
19---
20 configure.ac | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/configure.ac b/configure.ac
24index cf5c5b9..a228d63 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -699,6 +699,8 @@ AC_CHECK_HEADERS(byteswap.h)
28
29 AC_CHECK_HEADERS(unistd.h)
30
31+AC_CHECK_HEADERS([stdint.h])
32+
33 AC_CHECK_HEADERS(ws2tcpip.h)
34
35 AC_CHECK_HEADERS(alloca.h)
36--
372.9.2
38
diff --git a/meta/recipes-core/dbus/dbus_1.10.8.bb b/meta/recipes-core/dbus/dbus_1.10.8.bb
index bfaf65aeb8..62dd8bbd3e 100644
--- a/meta/recipes-core/dbus/dbus_1.10.8.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.8.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
17 file://dbus-1.init \ 17 file://dbus-1.init \
18 file://os-test.patch \ 18 file://os-test.patch \
19 file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ 19 file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
20 file://0001-configure.ac-explicitely-check-stdint.h.patch \
20" 21"
21 22
22SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43" 23SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43"