From: Changqing Li <[email protected]>
fix error:
file /usr/include/ffitarget.h conflicts between attempted installs of
lib32-libffi-dev-3.3-r0.armv7vet2hf_vfp and libffi-dev-3.3-r0.cortexa57
part of diff of ffitarget-32.h and ffitarget-64.h
< #ifdef __ILP32__
< #define FFI_SIZEOF_ARG 8
< #define FFI_SIZEOF_JAVA_RAW 4
< typedef unsigned long long ffi_arg;
< typedef signed long long ffi_sarg;
< #elif defined(_M_ARM64)
< #define FFI_SIZEOF_ARG 8
< typedef unsigned long long ffi_arg;
< typedef signed long long ffi_sarg;
---
> typedef unsigned long ffi_arg;
> typedef signed long ffi_sarg;
>
> typedef enum ffi_abi {
> FFI_FIRST_ABI = 0,
> FFI_SYSV,
> FFI_VFP,
> FFI_LAST_ABI,
> #if defined(__ARM_PCS_VFP) || defined(_M_ARM)
> FFI_DEFAULT_ABI = FFI_VFP,
40,41c49,51
< typedef unsigned long ffi_arg;
< typedef signed long ffi_sarg;
---
> FFI_DEFAULT_ABI = FFI_SYSV,
> #endif
> } ffi_abi;
44,50c54,61
< typedef enum ffi_abi
< {
< FFI_FIRST_ABI = 0,
< FFI_SYSV,
< FFI_LAST_ABI,
< FFI_DEFAULT_ABI = FFI_SYSV
< } ffi_abi;
---
> #define FFI_EXTRA_CIF_FIELDS \
> int vfp_used; \
> unsigned short vfp_reg_free, vfp_nargs; \
> signed char vfp_args[16] \
>
> #define FFI_TARGET_SPECIFIC_VARIADIC
> #ifndef _M_ARM
> #define FFI_TARGET_HAS_COMPLEX_TYPE
55a67
> #define FFI_GO_CLOSURES 1
61,62c73,74
< #define FFI_TRAMPOLINE_SIZE 16
< #define FFI_TRAMPOLINE_CLOSURE_OFFSET 16
---
> #define FFI_TRAMPOLINE_SIZE 12
> #define FFI_TRAMPOLINE_CLOSURE_OFFSET 8
Signed-off-by: Changqing Li <[email protected]>
---
meta/recipes-support/libffi/libffi_3.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/libffi/libffi_3.3.bb
b/meta/recipes-support/libffi/libffi_3.3.bb
index e5beb985c6..9dfdb9e39b 100644
--- a/meta/recipes-support/libffi/libffi_3.3.bb
+++ b/meta/recipes-support/libffi/libffi_3.3.bb
@@ -28,7 +28,7 @@ EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
inherit autotools texinfo multilib_header
do_install_append() {
- oe_multilib_header ffi.h
+ oe_multilib_header ffi.h ffitarget.h
}
FILES_${PN}-dev += "${libdir}/libffi-${PV}"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#141553):
https://lists.openembedded.org/g/openembedded-core/message/141553
Mute This Topic: https://lists.openembedded.org/mt/76237350/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
