commit: 8673cb04060bb988c798fe103ce71ea6bff0e784 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 21 01:00:37 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 21 01:00:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8673cb04
dev-libs/libffi: drop 3.3-r2, 3.4.2-r2 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libffi/Manifest | 3 - .../files/libffi-3.2.1-o-tmpfile-eacces.patch | 17 ----- .../files/libffi-3.3-compiler-vendor-quote.patch | 33 -------- .../libffi/files/libffi-3.3-power7-memcpy-2.patch | 28 ------- .../libffi/files/libffi-3.3-power7-memcpy.patch | 42 ----------- dev-libs/libffi/files/libffi-3.3-power7.patch | 39 ---------- dev-libs/libffi/files/libffi-3.3-ppc-int128.patch | 63 ---------------- .../files/libffi-3.3-ppc-vector-offset.patch | 53 ------------- .../libffi/files/libffi-3.3_rc0-ppc-macos-go.patch | 79 ------------------- .../files/libffi-3.4.2-backport-pr-722.patch | 88 ---------------------- dev-libs/libffi/libffi-3.3-r2.ebuild | 74 ------------------ dev-libs/libffi/libffi-3.4.2-r2.ebuild | 80 -------------------- dev-libs/libffi/metadata.xml | 1 - 13 files changed, 600 deletions(-) diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index da3ba58c225c..85514adcd060 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -1,4 +1 @@ -DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f -DIST libffi-3.4.2-loongarch64-20220428.patch.xz 64932 BLAKE2B d144dc28a7fce008bc5cd43d9e04125ea8e972324d77951d42039d46e818014079c871f87a0cdbec758b55320c02dff718cf2449f9c630cc899e8e1610784a60 SHA512 33715b21fe027692cc584d6524c03510af7876cc35f318221e1b2b91644cf165c02979c8b426228a8cc6c471e6a59d0435e761b6b7aef589c41a4f28caa36e62 -DIST libffi-3.4.2.tar.gz 1351355 BLAKE2B a8137bc895b819f949fd7705e405be627219c6d1fdef280253330f7407d4a548bb057d7bb0e9225d1767d42f9bf5f0ab3c455db1c3470d7cc876bb7b7d55d308 SHA512 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1 DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 diff --git a/dev-libs/libffi/files/libffi-3.2.1-o-tmpfile-eacces.patch b/dev-libs/libffi/files/libffi-3.2.1-o-tmpfile-eacces.patch deleted file mode 100644 index 92a733cbe823..000000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-o-tmpfile-eacces.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/529044 - -deploy this workaround until newer versions of the kernel/C library/libsandbox -are rolled out into general circulation - ---- a/src/closures.c -+++ b/src/closures.c -@@ -301,7 +301,8 @@ open_temp_exec_file_dir (const char *dir) - #ifdef O_TMPFILE - fd = open (dir, flags | O_RDWR | O_EXCL | O_TMPFILE, 0700); - /* If the running system does not support the O_TMPFILE flag then retry without it. */ -- if (fd != -1 || (errno != EINVAL && errno != EISDIR && errno != EOPNOTSUPP)) { -+ if (fd != -1 || (errno != EINVAL && errno != EISDIR && errno != EOPNOTSUPP && -+ errno != EACCES)) { - return fd; - } else { - errno = 0; diff --git a/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch deleted file mode 100644 index db5b69ce2db9..000000000000 --- a/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/753299 ---- a/testsuite/lib/libffi.exp -+++ b/testsuite/lib/libffi.exp -@@ -287,9 +287,6 @@ proc libffi-init { args } { - verbose "libffi $blddirffi" - - # Which compiler are we building with? -- set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"] -- regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor -- - if { [string match $compiler_vendor "gnu"] } { - set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] - if {$gccdir != ""} { ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,7 @@ fi - cat > local.exp <<EOF - set CC_FOR_TARGET "$CC" - set CXX_FOR_TARGET "$CXX" -+set compiler_vendor "$ax_cv_c_compiler_vendor" - EOF - - AM_MAINTAINER_MODE ---- a/configure -+++ b/configure -@@ -17402,6 +17402,7 @@ fi - cat > local.exp <<EOF - set CC_FOR_TARGET "$CC" - set CXX_FOR_TARGET "$CXX" -+set compiler_vendor "$ax_cv_c_compiler_vendor" - EOF - - diff --git a/dev-libs/libffi/files/libffi-3.3-power7-memcpy-2.patch b/dev-libs/libffi/files/libffi-3.3-power7-memcpy-2.patch deleted file mode 100644 index d9d47acb618f..000000000000 --- a/dev-libs/libffi/files/libffi-3.3-power7-memcpy-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6663047f56c2932a6b10a790f4ac6666dd181326 Mon Sep 17 00:00:00 2001 -From: Anthony Green <gr...@moxielogic.com> -Date: Fri, 29 Nov 2019 07:00:35 -0500 -Subject: [PATCH] Address platforms with no __int128. - ---- - src/powerpc/ffi_linux64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c -index de0d033..7364770 100644 ---- a/src/powerpc/ffi_linux64.c -+++ b/src/powerpc/ffi_linux64.c -@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) - if (next_arg.ul == gpr_end.ul) - next_arg.ul = rest.ul; - if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs) -- *vec_base.f128++ = **p_argv.f128; -+ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128)); - else -- *next_arg.f128 = **p_argv.f128; -+ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128)); - if (++next_arg.f128 == gpr_end.f128) - next_arg.f128 = rest.f128; - vecarg_count++; --- -2.26.0 - diff --git a/dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch b/dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch deleted file mode 100644 index 91f9a6f60fae..000000000000 --- a/dev-libs/libffi/files/libffi-3.3-power7-memcpy.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e50b9ef8b910fa642ef158f6642e60d54d7ad740 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Sat, 7 Dec 2019 02:34:14 -0800 -Subject: [PATCH] powerpc64: Use memcpy to help platforms with no __int128. - (#534) - -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - src/powerpc/ffi_linux64.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c -index 7364770..4d50878 100644 ---- a/src/powerpc/ffi_linux64.c -+++ b/src/powerpc/ffi_linux64.c -@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) - { - if (vecarg_count < NUM_VEC_ARG_REGISTERS64 - && i < nfixedargs) -- *vec_base.f128++ = *arg.f128++; -+ memcpy (vec_base.f128++, arg.f128, sizeof (float128)); - else -- *next_arg.f128 = *arg.f128++; -+ memcpy (next_arg.f128, arg.f128++, sizeof (float128)); - if (++next_arg.f128 == gpr_end.f128) - next_arg.f128 = rest.f128; - vecarg_count++; -@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif, - do - { - if (pvec < end_pvec && i < nfixedargs) -- *to.f128 = *pvec++; -+ memcpy (to.f128, pvec++, sizeof (float128)); - else -- *to.f128 = *from.f128; -+ memcpy (to.f128, from.f128, sizeof (float128)); - to.f128++; - from.f128++; - } --- -2.26.0 - diff --git a/dev-libs/libffi/files/libffi-3.3-power7.patch b/dev-libs/libffi/files/libffi-3.3-power7.patch deleted file mode 100644 index 83f518f4c2e3..000000000000 --- a/dev-libs/libffi/files/libffi-3.3-power7.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/701128 - -From 2138adb2a5b6a0bc2fe3518e0645eacc89b6f392 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Thu, 28 Nov 2019 00:02:42 +0000 -Subject: [PATCH] powerpc: fix build failure on power7 and older - -Build failure looks as: -``` -libtool: compile: powerpc-unknown-linux-gnu-gcc \ - -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... -In file included from src/powerpc/ffi.c:33: -src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target - 65 | typedef __int128 float128; - | ^~~~~~~~ -``` - -The fix avoids using __int128 in favour of aligned char[16]. - -Closes: https://github.com/libffi/libffi/issues/531 -Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> ---- - src/powerpc/ffi_powerpc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/powerpc/ffi_powerpc.h -+++ b/src/powerpc/ffi_powerpc.h -@@ -62,7 +62,7 @@ typedef _Float128 float128; - #elif defined(__FLOAT128__) - typedef __float128 float128; - #else --typedef __int128 float128; -+typedef char float128[16] __attribute__((aligned(16))); - #endif - - void FFI_HIDDEN ffi_closure_SYSV (void); --- -2.24.0 - diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch b/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch deleted file mode 100644 index ed53ae99902f..000000000000 --- a/dev-libs/libffi/files/libffi-3.3-ppc-int128.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4f9e20ac51ce13d46fed3c869e1deb6d9bb89444 Mon Sep 17 00:00:00 2001 -From: Andrew Geissler <geissona...@users.noreply.github.com> -Date: Fri, 1 May 2020 06:58:30 -0500 -Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 (#561) - -This is a patch pulled down from the following: -https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch - -This issue is being hit on OpenBMC code when pulling the latest -libffi tag and building on a P8 ppc64le machine. I verified this -patch fixes the issue we are seeing. - -Below is the original commit message: - -Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 -fails on: - -In file included from ../src/powerpc/ffi.c:33:0: -../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target - typedef _Float128 float128; - ^~~~~~~~~ - -Fix this build failure by checking for __HAVE_FLOAT128 before using -_Float128, as _Float128 is enabled only on specific conditions, see -output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: - - /* Defined to 1 if the current compiler invocation provides a - floating-point type with the IEEE 754 binary128 format, and this glibc - includes corresponding *f128 interfaces for it. */ - #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ - && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH - # define __HAVE_FLOAT128 1 - #else - # define __HAVE_FLOAT128 0 - #endif - -Fixes: - - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 - -Signed-off-by: Fabrice Fontaine <fontaine.fabr...@gmail.com> -Signed-off-by: Andrew Geissler <geissona...@yahoo.com> - -Co-authored-by: Fabrice Fontaine <fontaine.fabr...@gmail.com> ---- - src/powerpc/ffi_powerpc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h -index 8e2f2f0..960a5c4 100644 ---- a/src/powerpc/ffi_powerpc.h -+++ b/src/powerpc/ffi_powerpc.h -@@ -57,7 +57,7 @@ typedef union - double d; - } ffi_dblfl; - --#if defined(__FLOAT128_TYPE__) -+#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) - typedef _Float128 float128; - #elif defined(__FLOAT128__) - typedef __float128 float128; --- -2.27.0 - diff --git a/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch b/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch deleted file mode 100644 index 4bcd27e4f152..000000000000 --- a/dev-libs/libffi/files/libffi-3.3-ppc-vector-offset.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4d6d2866ae43e55325e8ee96561221804602cd7a Mon Sep 17 00:00:00 2001 -From: Samuel Holland <sam...@sholland.org> -Date: Fri, 21 Feb 2020 21:06:15 -0600 -Subject: [PATCH] Update powerpc sysv assembly for ffi_powerpc.h changes (#541) - -Some of the flag bits were moved when adding powerpc64 vector support. - -Fixes #536 ---- - src/powerpc/sysv.S | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S -index 1474ce7..df97734 100644 ---- a/src/powerpc/sysv.S -+++ b/src/powerpc/sysv.S -@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV) - bctrl - - /* Now, deal with the return value. */ -- mtcrf 0x01,%r31 /* cr7 */ -+ mtcrf 0x03,%r31 /* cr6-cr7 */ - bt- 31,L(small_struct_return_value) - bt- 30,L(done_return_value) - #ifndef __NO_FPRS__ - bt- 29,L(fp_return_value) - #endif - stw %r3,0(%r30) -- bf+ 28,L(done_return_value) -+ bf+ 27,L(done_return_value) - stw %r4,4(%r30) -- mtcrf 0x02,%r31 /* cr6 */ -- bf 27,L(done_return_value) -+ bf 26,L(done_return_value) - stw %r5,8(%r30) - stw %r6,12(%r30) - /* Fall through... */ -@@ -145,10 +144,9 @@ L(done_return_value): - #ifndef __NO_FPRS__ - L(fp_return_value): - .cfi_restore_state -- bf 28,L(float_return_value) -+ bf 27,L(float_return_value) - stfd %f1,0(%r30) -- mtcrf 0x02,%r31 /* cr6 */ -- bf 27,L(done_return_value) -+ bf 26,L(done_return_value) - stfd %f2,8(%r30) - b L(done_return_value) - L(float_return_value): --- -2.27.0 - diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch b/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch deleted file mode 100644 index 88f9b4557657..000000000000 --- a/dev-libs/libffi/files/libffi-3.3_rc0-ppc-macos-go.patch +++ /dev/null @@ -1,79 +0,0 @@ -ffi_darwin: use FFI_GO_CLOSURES guard to avoid unsolvable dependencies - -The go calls depend on compilation and link-time signatures and symbols -which are missing because they aren't build due to FFO_GO_CLOSURES not -being set. - -Signed-off-by: Fabian Groffen <grob...@gentoo.org> - ---- a/src/powerpc/ffi_darwin.c 2018-04-02 14:21:51.000000000 +0200 -+++ b/src/powerpc/ffi_darwin.c 2018-12-10 13:57:26.000000000 +0100 -@@ -909,8 +909,10 @@ - extern void ffi_call_AIX(extended_cif *, long, unsigned, unsigned *, - void (*fn)(void), void (*fn2)(void)); - -+#if FFI_GO_CLOSURES - extern void ffi_call_go_AIX(extended_cif *, long, unsigned, unsigned *, - void (*fn)(void), void (*fn2)(void), void *closure); -+#endif - - extern void ffi_call_DARWIN(extended_cif *, long, unsigned, unsigned *, - void (*fn)(void), void (*fn2)(void), ffi_type*); -@@ -950,6 +952,7 @@ - } - } - -+#if FFI_GO_CLOSURES - void - ffi_call_go (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue, - void *closure) -@@ -981,6 +984,7 @@ - break; - } - } -+#endif - - static void flush_icache(char *); - static void flush_range(char *, int); -@@ -1110,6 +1114,7 @@ - return FFI_OK; - } - -+#if FFI_GO_CLOSURES - ffi_status - ffi_prep_go_closure (ffi_go_closure* closure, - ffi_cif* cif, -@@ -1133,6 +1138,7 @@ - } - return FFI_OK; - } -+#endif - - static void - flush_icache(char *addr) -@@ -1168,9 +1174,11 @@ - ffi_closure_helper_DARWIN (ffi_closure *, void *, - unsigned long *, ffi_dblfl *); - -+#if FFI_GO_CLOSURES - ffi_type * - ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *, - unsigned long *, ffi_dblfl *); -+#endif - - /* Basically the trampoline invokes ffi_closure_ASM, and on - entry, r11 holds the address of the closure. -@@ -1430,6 +1438,7 @@ - closure->user_data, rvalue, pgr, pfr); - } - -+#if FFI_GO_CLOSURES - ffi_type * - ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue, - unsigned long *pgr, ffi_dblfl *pfr) -@@ -1437,4 +1446,5 @@ - return ffi_closure_helper_common (closure->cif, closure->fun, - closure, rvalue, pgr, pfr); - } -+#endif - diff --git a/dev-libs/libffi/files/libffi-3.4.2-backport-pr-722.patch b/dev-libs/libffi/files/libffi-3.4.2-backport-pr-722.patch deleted file mode 100644 index 41821e89140c..000000000000 --- a/dev-libs/libffi/files/libffi-3.4.2-backport-pr-722.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f4d413725030b35ec2f01733b154489d0b4c6e1d Mon Sep 17 00:00:00 2001 -From: matoro <mat...@users.noreply.github.com> -Date: Sun, 26 Jun 2022 23:19:00 -0400 -Subject: [PATCH] Move FFI_TYPE definitions above <ffitarget.h> include - -For powerpc at least, these definitions are referenced in the -target-specific ffitarget.h. Discovered in the jffi project. Should -close https://github.com/libffi/libffi/issues/637. Downstream jffi bug -https://github.com/jnr/jffi/issues/107. Downstream distro bug -https://bugs.gentoo.org/827215. - -Testing - both libffi and jffi test suites pass with this patch applied, -at least on ppc64le linux. I did not see any warnings about -redefinitions. - -Tested versions - libffi 3.4.2, jffi 1.3.6 and 1.3.9. ---- - include/ffi.h.in | 50 ++++++++++++++++++++++++------------------------ - 1 file changed, 25 insertions(+), 25 deletions(-) - -diff --git a/include/ffi.h.in b/include/ffi.h.in -index d16f307e..6cd19baa 100644 ---- a/include/ffi.h.in -+++ b/include/ffi.h.in -@@ -56,6 +56,31 @@ extern "C" { - - /* ---- System configuration information --------------------------------- */ - -+/* If these change, update src/mips/ffitarget.h. */ -+#define FFI_TYPE_VOID 0 -+#define FFI_TYPE_INT 1 -+#define FFI_TYPE_FLOAT 2 -+#define FFI_TYPE_DOUBLE 3 -+#if @HAVE_LONG_DOUBLE@ -+#define FFI_TYPE_LONGDOUBLE 4 -+#else -+#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE -+#endif -+#define FFI_TYPE_UINT8 5 -+#define FFI_TYPE_SINT8 6 -+#define FFI_TYPE_UINT16 7 -+#define FFI_TYPE_SINT16 8 -+#define FFI_TYPE_UINT32 9 -+#define FFI_TYPE_SINT32 10 -+#define FFI_TYPE_UINT64 11 -+#define FFI_TYPE_SINT64 12 -+#define FFI_TYPE_STRUCT 13 -+#define FFI_TYPE_POINTER 14 -+#define FFI_TYPE_COMPLEX 15 -+ -+/* This should always refer to the last type code (for sanity checks). */ -+#define FFI_TYPE_LAST FFI_TYPE_COMPLEX -+ - #include <ffitarget.h> - - #ifndef LIBFFI_ASM -@@ -496,31 +521,6 @@ ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type, - - #endif - --/* If these change, update src/mips/ffitarget.h. */ --#define FFI_TYPE_VOID 0 --#define FFI_TYPE_INT 1 --#define FFI_TYPE_FLOAT 2 --#define FFI_TYPE_DOUBLE 3 --#if @HAVE_LONG_DOUBLE@ --#define FFI_TYPE_LONGDOUBLE 4 --#else --#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE --#endif --#define FFI_TYPE_UINT8 5 --#define FFI_TYPE_SINT8 6 --#define FFI_TYPE_UINT16 7 --#define FFI_TYPE_SINT16 8 --#define FFI_TYPE_UINT32 9 --#define FFI_TYPE_SINT32 10 --#define FFI_TYPE_UINT64 11 --#define FFI_TYPE_SINT64 12 --#define FFI_TYPE_STRUCT 13 --#define FFI_TYPE_POINTER 14 --#define FFI_TYPE_COMPLEX 15 -- --/* This should always refer to the last type code (for sanity checks). */ --#define FFI_TYPE_LAST FFI_TYPE_COMPLEX -- - #ifdef __cplusplus - } - #endif diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild deleted file mode 100644 index 3d1f2530f8fe..000000000000 --- a/dev-libs/libffi/libffi-3.3-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit multilib-minimal - -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/"; -SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"; - -LICENSE="MIT" -SLOT="0/7" # SONAME=libffi.so.7 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax-kernel static-libs test" - -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="" -BDEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README.md" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 - "${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch - "${FILESDIR}"/${PN}-3.3-power7.patch - "${FILESDIR}"/${PN}-3.3-power7-memcpy.patch - "${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch - "${FILESDIR}"/${PN}-3.3-ppc-int128.patch - "${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch - "${FILESDIR}"/${PN}-3.3-compiler-vendor-quote.patch -) - -S=${WORKDIR}/${MY_P} - -ECONF_SOURCE=${S} - -src_prepare() { - default - if [[ ${CHOST} == arm64-*-darwin* ]] ; then - # ensure we use aarch64 asm, not x86 on arm64 - sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ - configure configure.host || die - fi -} - -multilib_src_configure() { - # --includedir= path maintains a few properties: - # 1. have stable name across libffi versions: some packages like - # dev-lang/ghc or kde-frameworks/networkmanager-qt embed - # ${includedir} at build-time. Don't require those to be - # rebuilt unless SONAME changes. bug #695788 - # - # We use /usr/.../${PN} (instead of former /usr/.../${P}). - # - # 2. have ${ABI}-specific location as ffi.h is target-dependent. - # - # We use /usr/$(get_libdir)/... to have ABI identifier. - econf \ - --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ - --disable-multi-os-directory \ - $(use_enable static-libs static) \ - $(use_enable pax-kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die - einstalldocs -} diff --git a/dev-libs/libffi/libffi-3.4.2-r2.ebuild b/dev-libs/libffi/libffi-3.4.2-r2.ebuild deleted file mode 100644 index b74e671f7328..000000000000 --- a/dev-libs/libffi/libffi-3.4.2-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal preserve-libs - -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/"; -SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz - experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${MY_P}-loongarch64-20220428.patch.xz )" -S="${WORKDIR}"/${MY_P} - -LICENSE="MIT" -# This is a core package which is depended on by e.g. Python -# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users -# with FEATURES="-preserved-libs" or another package manager if SONAME -# changes. -SLOT="0/8" # SONAME=libffi.so.8 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug exec-static-trampoline experimental-loong pax-kernel static-libs test" - -RESTRICT="!test? ( test )" -BDEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README.md" - -ECONF_SOURCE=${S} - -PATCHES=( "${FILESDIR}/libffi-3.4.2-backport-pr-722.patch" ) # bug 827215 - -src_prepare() { - if use experimental-loong; then - PATCHES+=( "${WORKDIR}/${MY_P}-loongarch64-20220428.patch" ) - fi - - default - if [[ ${CHOST} == arm64-*-darwin* ]] ; then - # ensure we use aarch64 asm, not x86 on arm64 - sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ - configure configure.host || die - fi -} - -multilib_src_configure() { - # --includedir= path maintains a few properties: - # 1. have stable name across libffi versions: some packages like - # dev-lang/ghc or kde-frameworks/networkmanager-qt embed - # ${includedir} at build-time. Don't require those to be - # rebuilt unless SONAME changes. bug #695788 - # - # We use /usr/.../${PN} (instead of former /usr/.../${P}). - # - # 2. have ${ABI}-specific location as ffi.h is target-dependent. - # - # We use /usr/$(get_libdir)/... to have ABI identifier. - econf \ - --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ - --disable-multi-os-directory \ - $(use_enable static-libs static) \ - $(use_enable exec-static-trampoline exec-static-tramp) \ - $(use_enable pax-kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die - einstalldocs -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libffi.so.7 -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7 -} diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml index 01f91694bb53..aa5aa78f433f 100644 --- a/dev-libs/libffi/metadata.xml +++ b/dev-libs/libffi/metadata.xml @@ -35,7 +35,6 @@ </longdescription> <use> <flag name="exec-static-trampoline">Don't rely on dynamic code generation for trampolines.</flag> - <flag name="experimental-loong">Add experimental LoongArch patchset</flag> <flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag> </use> <upstream>
