summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2014-09-12 12:20:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-16 22:14:03 +0100
commiteb6bf5347dd3e622906e2ea9c758d149b35a2863 (patch)
treef2d53cd408e4e65a724fb03ecc7ee244799a09a5
parent23613ef0f9220e66e065537a372c185c18047d32 (diff)
downloadpoky-eb6bf5347dd3e622906e2ea9c758d149b35a2863.tar.gz
at-spi2-core: fix DBIND_CHECK_ALIGNOF m4 macro
Modify the macro so it will work when cross-compiling. Note that the values checked are normally in a site file so the macro rarely has to discover them. (From OE-Core rev: 09610d6cdda95e964a7565b13eb35a26ae652aa9) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.12.0.bb5
-rw-r--r--meta/recipes-support/atk/files/core_acinclude_m4.patch40
2 files changed, 44 insertions, 1 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core_2.12.0.bb b/meta/recipes-support/atk/at-spi2-core_2.12.0.bb
index 31e133fe43..e67155ccbd 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.12.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.12.0.bb
@@ -4,7 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
4 4
5MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 5MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
6 6
7SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" 7SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
8 file://core_acinclude_m4.patch \
9 "
10
8SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef" 11SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef"
9SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89" 12SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89"
10 13
diff --git a/meta/recipes-support/atk/files/core_acinclude_m4.patch b/meta/recipes-support/atk/files/core_acinclude_m4.patch
new file mode 100644
index 0000000000..29c538e2c3
--- /dev/null
+++ b/meta/recipes-support/atk/files/core_acinclude_m4.patch
@@ -0,0 +1,40 @@
1at-spi2-core: fix alignof m4 macro
2
3DBIND_CHECK_ALIGNOF does not work when cross-compiling, so we modify
4it to use AC_CHECK_ALIGNOF.
5
6Upstream-Status: Pending
7
8Signed-off-by: joe.slater@windriver.com
9
10
11--- a/acinclude.m4
12+++ b/acinclude.m4
13@@ -2,7 +2,26 @@
14 # type alignment test #
15 #######################
16
17-AC_DEFUN([DBIND_CHECK_ALIGNOF],
18+AC_DEFUN([DBIND_CHECK_ALIGNOF],[
19+AC_CHECK_ALIGNOF($1,[
20+#include <stdio.h>
21+#include <stdlib.h>
22+#define DBUS_API_SUBJECT_TO_CHANGE
23+#include <dbus/dbus.h>
24+typedef struct {char s1;} dbind_struct;
25+typedef void *dbind_pointer;
26+])
27+
28+dnl Note that we substitute for names like @DBIND_ALIGNOF_DBIND_STRUCT@, but
29+dnl we #define names like ALIGNOF_DBIND_STRUCT in config.h!
30+dnl
31+AC_SUBST(translit(dbind_alignof_$1, [a-z *], [A-Z_P]),[$ac_cv_alignof_$1])
32+
33+])
34+
35+dnl The following does not work for cross-compilation.
36+dnl
37+AC_DEFUN([xDBIND_CHECK_ALIGNOF],
38 [changequote(<<, >>)dnl
39 dnl The name to #define.
40 define(<<AC_TYPE_NAME>>,