diff options
author | Changqing Li <changqing.li@windriver.com> | 2020-08-18 17:59:02 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-20 15:30:07 +0100 |
commit | 58eb470cade48def14df92f742218ba980a2fd1f (patch) | |
tree | facec2ca8b3093a1762be958d155494297474d97 /meta/recipes-support | |
parent | 76dbaaf5e23cf631f2c2b3f499743f144ba36e28 (diff) | |
download | poky-58eb470cade48def14df92f742218ba980a2fd1f.tar.gz |
gpgme: fix multilib header conflict
fix error:
file /usr/include/gpgme.h conflicts between attempted installs of gpgme-dev-1.13.1-r0.core2_64 and lib32-gpgme-dev-1.13.1-r0.core2_32
part of diff:
-#if 64
+#if 0
#ifndef _FILE_OFFSET_BITS
-#error GPGME was compiled with _FILE_OFFSET_BITS = 64, please see the section "Largefile support (LFS)" in the GPGME manual.
+#error GPGME was compiled with _FILE_OFFSET_BITS = 0, please see the section "Largefile support (LFS)" in the GPGME manual.
#else
-#if (_FILE_OFFSET_BITS) != (64)
-#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 64, please see the section "Largefile support (LFS)" in the GPGME manual.
+#if (_FILE_OFFSET_BITS) != (0)
+#error GPGME was compiled with a different value for _FILE_OFFSET_BITS, namely 0, please see the section "Largefile support (LFS)" in the GPGME manual.
#endif
#endif
#endif
LFS support is enabled by default, and this header is generated during
build according to current configure
(From OE-Core rev: bd056f9c4c22740a4f7ede00c758a21037eae5ca)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb index 9fc1ae24a4..b51534351d 100644 --- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb +++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb | |||
@@ -59,7 +59,7 @@ EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ | |||
59 | --disable-lang-python-test \ | 59 | --disable-lang-python-test \ |
60 | ' | 60 | ' |
61 | 61 | ||
62 | inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} | 62 | inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header |
63 | 63 | ||
64 | export PKG_CONFIG='pkg-config' | 64 | export PKG_CONFIG='pkg-config' |
65 | 65 | ||
@@ -83,3 +83,7 @@ do_configure_prepend () { | |||
83 | rm -f ${S}/m4/libassuan.m4 | 83 | rm -f ${S}/m4/libassuan.m4 |
84 | rm -f ${S}/m4/python.m4 | 84 | rm -f ${S}/m4/python.m4 |
85 | } | 85 | } |
86 | |||
87 | do_install_append() { | ||
88 | oe_multilib_header gpgme.h | ||
89 | } | ||