From: Changqing Li <[email protected]> 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
diff of gpgme-32.h and gpgme-64.h 21c21 < * Generated from gpgme.h.in for i686-pokymllib32-linux-gnu. --- > * Generated from gpgme.h.in for x86_64-poky-linux-gnu. 109c109 < #if 64 --- > #if 0 111c111 < #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. 113,114c113,114 < #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. Signed-off-by: Changqing Li <[email protected]> --- meta/recipes-support/gpgme/gpgme_1.13.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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}" \ --disable-lang-python-test \ ' -inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} +inherit autotools texinfo binconfig-disabled pkgconfig distutils-common-base ${PYTHON_INHERIT} multilib_header export PKG_CONFIG='pkg-config' @@ -83,3 +83,7 @@ do_configure_prepend () { rm -f ${S}/m4/libassuan.m4 rm -f ${S}/m4/python.m4 } + +do_install_append() { + oe_multilib_header gpgme.h +} -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141554): https://lists.openembedded.org/g/openembedded-core/message/141554 Mute This Topic: https://lists.openembedded.org/mt/76237360/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
