Hi, Richard
Maybe I didn't make things clear, gpgme is build with LFS enabled by
default for both lib32-gpgme and gpgme.
for 64bit, _FILE_OFFSET_BITS is set to 0, and for 32bit,
_FILE_OFFSET_BITS is set to 64. And this is same as the diff part said.
And here is part of section "Largefile support (LFS)" in the GPGME manual:
On POSIX platforms GPGME is compiled using largefile support by default.
This means that your application must do the same, at least as far as it
is relevant for using the gpgme.h header file. All types in this header
files refer to their largefile counterparts, if they are different from
any default types on the system.
On POSIX platforms you can enable largefile support, if it is different
from the default on the system the application is compiled on, by using
the Autoconf macro AC_SYS_LARGEFILE. If you do this, then you don’t need
to worry about anything else: It will just work. In this case you might
also want to use AC_FUNC_FSEEKO to take advantage of some new
interfaces, and AC_TYPE_OFF_T (just in case).
If you do not use Autoconf, you can define the preprocessor symbol
_FILE_OFFSET_BITS to 64 before including any header files, for example
by specifying the option -D_FILE_OFFSET_BITS=64 on the compiler command
line. You will also want to define the preprocessor symbol
LARGEFILE_SOURCE to 1 in this case, to take advantage of some new
interfaces.
And this header gpgme.h can used to check if application using gpgme
have same configuration (like _FILE_OFFSET_BITS) as gpgme. so I think
this patch is also needed.
//Changqing
On 8/18/20 5:59 PM, 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
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
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
+}
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#141621):
https://lists.openembedded.org/g/openembedded-core/message/141621
Mute This Topic: https://lists.openembedded.org/mt/76280345/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
