diff options
| author |   Jeremy Puhlman <jpuhlman@mvista.com> | 2018-06-14 11:25:04 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-27 13:53:28 +0100 |
| commit | 088814ef79015d9df0c8c8bc61219507cfe52ad5 (patch) | |
| tree | 7d3d8fa3cc2d510b977e8d78fb1667a1da9a3366 /meta | |
| parent | c03cef42e079e4ed3d1e4f401722778157158bd6 (diff) | |
| download | openembedded-core-088814ef79015d9df0c8c8bc61219507cfe52ad5.tar.gz | |
atk: Correct multilib conflict in header.
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-support/atk/atk_2.28.1.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch b/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch new file mode 100644 index 0000000000..047e81fb61 --- /dev/null +++ b/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted + +From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman <jpuhlman@mvista.com> +Date: Thu, 14 Jun 2018 17:21:49 +0000 +Subject: [PATCH] Switch from filename to basename + +When atk-enum-types.h is installed in to a system, the user likely has +no access to the location where the headers were built, especially if +the software was built in a sysroot environment. If the headers were +built for a mulitlib environment, the build pathing may be different. +Subsequently, if two mulitlib variants of atk are installed together the +headers conflict for no other reason then they were built in two +different locations. Switching from filename to basename, still should +provide sufficient information on the providence of the enums, while not +conflicting for really no good reason. + +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + atk/atk-enum-types.h.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template +index 7b4cec4..8321c24 100644 +--- a/atk/atk-enum-types.h.template ++++ b/atk/atk-enum-types.h.template +@@ -14,7 +14,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.14.1.459.g238e487 + diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.28.1.bb index 657c69d576..a051247d8f 100644 --- a/meta/recipes-support/atk/atk_2.28.1.bb +++ b/meta/recipes-support/atk/atk_2.28.1.bb @@ -27,6 +27,7 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'Tr SRC_URI_append = " \ file://0001-meson.build-enable-introspection-for-cross-compile.patch \ + file://0001-Switch-from-filename-to-basename.patch \ " SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" |