-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#23362) libffi: Add 3.4.6, remove 3.4.2 and 3.4.3
* Add libffi 3.4.6 * Fix MSVC build * Don't define FFI_BUILDING if not necessary * ffi static defines only necessary for MSVC * Keep static defines for now * Disable Mac ARM build on 3.3 * Fix patch name * Remove some dead code * Remove unused import * Remove libffi 3.4.2 and 3.4.3 * remove unused versions from conandata.yml Signed-off-by: Uilian Ries <[email protected]> --------- Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Uilian Ries <[email protected]>
- Loading branch information
1 parent
454cc39
commit 3286aeb
Showing
9 changed files
with
88 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
recipes/libffi/all/patches/0004-3.4.6-fix-complex-type-msvc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| diff --git a/src/types.c b/src/types.c | ||
| index c1c27f3..d5d52bb 100644 | ||
| --- a/src/types.c | ||
| +++ b/src/types.c | ||
| @@ -31,6 +31,8 @@ | ||
| #include <ffi.h> | ||
| #include <ffi_common.h> | ||
|
|
||
| +#include <complex.h> | ||
| + | ||
| /* Type definitions */ | ||
|
|
||
| #define FFI_TYPEDEF(name, type, id, maybe_const)\ | ||
| @@ -45,17 +47,17 @@ maybe_const ffi_type ffi_type_##name = { \ | ||
| id, NULL \ | ||
| } | ||
|
|
||
| -#define FFI_COMPLEX_TYPEDEF(name, type, maybe_const) \ | ||
| +#define FFI_COMPLEX_TYPEDEF(name, complex_type, maybe_const) \ | ||
| static ffi_type *ffi_elements_complex_##name [2] = { \ | ||
| (ffi_type *)(&ffi_type_##name), NULL \ | ||
| }; \ | ||
| struct struct_align_complex_##name { \ | ||
| char c; \ | ||
| - _Complex type x; \ | ||
| + complex_type x; \ | ||
| }; \ | ||
| FFI_EXTERN \ | ||
| maybe_const ffi_type ffi_type_complex_##name = { \ | ||
| - sizeof(_Complex type), \ | ||
| + sizeof(complex_type), \ | ||
| offsetof(struct struct_align_complex_##name, x), \ | ||
| FFI_TYPE_COMPLEX, \ | ||
| (ffi_type **)ffi_elements_complex_##name \ | ||
| @@ -99,8 +101,18 @@ const ffi_type ffi_type_longdouble = { 16, 16, 4, NULL }; | ||
| FFI_TYPEDEF(longdouble, long double, FFI_TYPE_LONGDOUBLE, FFI_LDBL_CONST); | ||
| #endif | ||
|
|
||
| +#ifdef _MSC_VER | ||
| +# define FLOAT_COMPLEX _C_float_complex | ||
| +# define DOUBLE_COMPLEX _C_double_complex | ||
| +# define LDOUBLE_COMPLEX _C_ldouble_complex | ||
| +#else | ||
| +# define FLOAT_COMPLEX float _Complex | ||
| +# define DOUBLE_COMPLEX double _Complex | ||
| +# define LDOUBLE_COMPLEX long double _Complex | ||
| +#endif | ||
| + | ||
| #ifdef FFI_TARGET_HAS_COMPLEX_TYPE | ||
| -FFI_COMPLEX_TYPEDEF(float, float, const); | ||
| -FFI_COMPLEX_TYPEDEF(double, double, const); | ||
| -FFI_COMPLEX_TYPEDEF(longdouble, long double, FFI_LDBL_CONST); | ||
| +FFI_COMPLEX_TYPEDEF(float, FLOAT_COMPLEX, const); | ||
| +FFI_COMPLEX_TYPEDEF(double, DOUBLE_COMPLEX, const); | ||
| +FFI_COMPLEX_TYPEDEF(longdouble, LDOUBLE_COMPLEX, FFI_LDBL_CONST); | ||
| #endif |
11 changes: 0 additions & 11 deletions
11
...ibffi/all/patches/0005-3.4.2-do-not-install-libraries-to-arch-dependent-directories.patch
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
...ibffi/all/patches/0005-3.4.3-do-not-install-libraries-to-arch-dependent-directories.patch
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
recipes/libffi/all/patches/0006-3.4.2-library-no-version-suffix.patch
This file was deleted.
Oops, something went wrong.
8 changes: 5 additions & 3 deletions
8
...006-3.4.3-library-no-version-suffix.patch → ...006-3.4.6-library-no-version-suffix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| versions: | ||
| "3.4.4": | ||
| folder: "all" | ||
| "3.4.3": | ||
| "3.4.6": | ||
| folder: "all" | ||
| "3.4.2": | ||
| "3.4.4": | ||
| folder: "all" | ||
| "3.3": | ||
| folder: "all" |