On Fri, 2020-08-14 at 14:31 +0800, Changqing Li wrote: > 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 > > 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 > +}
These kinds of changes are hard to review. Could you please include a diff of the header issues in the commit message please? Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141457): https://lists.openembedded.org/g/openembedded-core/message/141457 Mute This Topic: https://lists.openembedded.org/mt/76183490/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
