summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Xiao <xiao.zhang@windriver.com>2018-03-11 17:32:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 06:27:19 -0700
commit508ab8b836a5e69737539d0e0e3d828c936d4407 (patch)
tree64973857a5b37fbe9c5f0534d2963d5ccaf3ddce
parent5ae48065297d595cfe1f01c4bd878c757f8ce69c (diff)
downloadpoky-508ab8b836a5e69737539d0e0e3d828c936d4407.tar.gz
libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h
Header file conflict between 32-bit and 64-bit versions. (From OE-Core rev: 66b0f977cc1809616b78939f8096330e7c8a94de) Signed-off-by: Zhang Xiao <xiao.zhang@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/libgpg-error/libgpg-error_1.27.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
index b2e2d507c9..b74f079f5d 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a2
21 21
22BINCONFIG = "${bindir}/gpg-error-config" 22BINCONFIG = "${bindir}/gpg-error-config"
23 23
24inherit autotools binconfig-disabled pkgconfig gettext 24inherit autotools binconfig-disabled pkgconfig gettext multilib_header
25CPPFLAGS += "-P" 25CPPFLAGS += "-P"
26do_compile_prepend() { 26do_compile_prepend() {
27 TARGET_FILE=linux-gnu 27 TARGET_FILE=linux-gnu
@@ -53,6 +53,7 @@ do_compile_prepend() {
53do_install_append() { 53do_install_append() {
54 # we don't have common lisp in OE 54 # we don't have common lisp in OE
55 rm -rf "${D}${datadir}/common-lisp/" 55 rm -rf "${D}${datadir}/common-lisp/"
56 oe_multilib_header gpg-error.h gpgrt.h
56} 57}
57 58
58FILES_${PN}-dev += "${bindir}/gpg-error" 59FILES_${PN}-dev += "${bindir}/gpg-error"