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"
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
+           file://core_acinclude_m4.patch \
+          "
 SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef"
 SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89"
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 @@
+at-spi2-core: fix alignof m4 macro
+DBIND_CHECK_ALIGNOF does not work when cross-compiling, so we modify
+it to use AC_CHECK_ALIGNOF.
+Upstream-Status:  Pending
+Signed-off-by: joe.slater@windriver.com
+--- a/acinclude.m4
+++ b/acinclude.m4
+@@ -2,7 +2,26 @@
+ # type alignment test #
+ #######################
+ 
+-AC_DEFUN([DBIND_CHECK_ALIGNOF],
+AC_DEFUN([DBIND_CHECK_ALIGNOF],[
+AC_CHECK_ALIGNOF($1,[
+#include <stdio.h>
+#include <stdlib.h>
+#define DBUS_API_SUBJECT_TO_CHANGE
+#include <dbus/dbus.h>
+typedef struct {char s1;} dbind_struct;
+typedef void *dbind_pointer;
+])
+
+dnl Note that we substitute for names like @DBIND_ALIGNOF_DBIND_STRUCT@, but
+dnl we #define names like ALIGNOF_DBIND_STRUCT in config.h!
+dnl
+AC_SUBST(translit(dbind_alignof_$1, [a-z *], [A-Z_P]),[$ac_cv_alignof_$1])
+
+])
+
+dnl The following does not work for cross-compilation.
+dnl
+AC_DEFUN([xDBIND_CHECK_ALIGNOF],
+        [changequote(<<, >>)dnl
+        dnl The name to #define.
+        define(<<AC_TYPE_NAME>>,

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
5	MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"	5	MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
6		6
7	SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"	7	SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
		8	file://core_acinclude_m4.patch \
		9	"
		10
8	SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef"	11	SRC_URI[md5sum] = "b12ad0e0924706f5e7f51216241068ef"
9	SRC_URI[sha256sum] = "db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89"	12	SRC_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 @@
		1	at-spi2-core: fix alignof m4 macro
		2
		3	DBIND_CHECK_ALIGNOF does not work when cross-compiling, so we modify
		4	it to use AC_CHECK_ALIGNOF.
		5
		6	Upstream-Status: Pending
		7
		8	Signed-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>>,