On Mon, 2020-08-17 at 10:57 +0800, Changqing Li wrote: > From: Changqing Li <changqing...@windriver.com> > > 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.
Please use unifed diff format as we use in patches as its much more readable. This one raises interesting questions, perhaps we should be enabling large file support everywhere within gpgme instead of this patch? The other patch (libffi) looks necessary but I'd much prefer if it diff -u. Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141558): https://lists.openembedded.org/g/openembedded-core/message/141558 Mute This Topic: https://lists.openembedded.org/mt/76237360/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
