diff options
author | Ross Burton <ross.burton@intel.com> | 2017-11-15 23:21:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-07 06:34:50 -0800 |
commit | c141184cc7a6a1b432fc127873126aff116e56a9 (patch) | |
tree | 2dd52d3c21fa5696a6aef1ea3260a5e4fc937c48 /meta | |
parent | e5f258cecef6c51a4d7ebeedbaa29d2126e566e3 (diff) | |
download | poky-c141184cc7a6a1b432fc127873126aff116e56a9.tar.gz |
dbus: remove upstreamed patch
(From OE-Core rev: 887afb4cf326cf3ad37761343db9e898dbcad2f5)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch | 38 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus_1.12.2.bb | 1 |
2 files changed, 0 insertions, 39 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 deleted file mode 100644 index 85acb7b1ca..0000000000 --- a/meta/recipes-core/dbus/dbus/0001-configure.ac-explicitely-check-stdint.h.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 1bfde222926be624a30a6e4b2cdc2c5064a36298 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | ||
3 | Date: Fri, 29 Jul 2016 01:19:37 +0300 | ||
4 | Subject: [PATCH] configure.ac: explicitely check stdint.h | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Otherwise HAVE_STDINT_H will not be defined or the var will not be | ||
10 | picked 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 | |||
13 | Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | ||
14 | [smcv: fix Autoconf underquoting] | ||
15 | Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> | ||
16 | |||
17 | Upstream-Status: Backport [from dbus-1.10] | ||
18 | |||
19 | --- | ||
20 | configure.ac | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index 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 | -- | ||
37 | 2.9.2 | ||
38 | |||
diff --git a/meta/recipes-core/dbus/dbus_1.12.2.bb b/meta/recipes-core/dbus/dbus_1.12.2.bb index d923d33558..fb5b69aa47 100644 --- a/meta/recipes-core/dbus/dbus_1.12.2.bb +++ b/meta/recipes-core/dbus/dbus_1.12.2.bb | |||
@@ -16,7 +16,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ | |||
16 | file://tmpdir.patch \ | 16 | file://tmpdir.patch \ |
17 | file://dbus-1.init \ | 17 | file://dbus-1.init \ |
18 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ | 18 | file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ |
19 | file://0001-configure.ac-explicitely-check-stdint.h.patch \ | ||
20 | " | 19 | " |
21 | 20 | ||
22 | SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" | 21 | SRC_URI[md5sum] = "3361456cadb99aa6601bed5b48964254" |