From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/libffi/Manifest | 12 ---- dev-libs/libffi/files/libffi-3.1-darwin-x32.patch | 22 ------- .../libffi/files/libffi-3.2.1-complex-ia64.patch | 41 ------------ .../libffi/files/libffi-3.2.1-complex_alpha.patch | 20 ------ .../files/libffi-3.2.1-ia64-small-struct.patch | 74 ---------------------- .../files/libffi-3.2.1-include-path-autogen.patch | 56 ---------------- .../libffi/files/libffi-3.2.1-include-path.patch | 39 ------------ .../files/libffi-3.2.1-o-tmpfile-eacces.patch | 17 ----- dev-libs/libffi/libffi-3.2.1-r1.ebuild | 68 -------------------- dev-libs/libffi/libffi-3.2.1-r2.ebuild | 69 -------------------- dev-libs/libffi/libffi-3.2.1.ebuild | 58 ----------------- dev-libs/libffi/metadata.xml | 39 ------------ 12 files changed, 515 deletions(-) delete mode 100644 dev-libs/libffi/Manifest delete mode 100644 dev-libs/libffi/files/libffi-3.1-darwin-x32.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-include-path.patch delete mode 100644 dev-libs/libffi/files/libffi-3.2.1-o-tmpfile-eacces.patch delete mode 100644 dev-libs/libffi/libffi-3.2.1-r1.ebuild delete mode 100644 dev-libs/libffi/libffi-3.2.1-r2.ebuild delete mode 100644 dev-libs/libffi/libffi-3.2.1.ebuild delete mode 100644 dev-libs/libffi/metadata.xml (limited to 'dev-libs/libffi') diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest deleted file mode 100644 index 4232fafff840..000000000000 --- a/dev-libs/libffi/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24 -AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1 -AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b -AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a8609426d35a1217cbb0718e7580c2a3b646a7d493d4b7aecc25dee35f61f7e036904e6b7dde8d3d398842dab7149053da2a2761a3 SHA512 4f33d849210da633629e16e96779dce2e03c0d1e6f44b91b68410e35433378f8cf0a04736d161539ea368f54a713177e6e8df2fde93d40c6917d03ad74a99c2c -AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f -AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3 -AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65 -DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 -EBUILD libffi-3.2.1-r1.ebuild 2280 BLAKE2B b7e132e2eb06444885e48cbc90c8d211102c83a94aa86a5c44e2b1279737641915667753145b9ea9aaea29ef25f0fc833e0155e750dc9b1ab25d1ae917f3f580 SHA512 ca3ca3fdb0b5b83ef2fb472021ffc0a90fadeddb30569dfa41422f3a154d17b18701d7540e72420241792fdbe8b893d89b15a439b9159fabcfccdc1bc3b16e5e -EBUILD libffi-3.2.1-r2.ebuild 2339 BLAKE2B 60b29ea62d0db9dd9ca2a7ce8a425b8d37bd9ce15f7558b839d5c89add50be0531055510a9dc06ffa498046eeb9436b4526b72226c9b3a36b15bc08539a021de SHA512 ed5f7463a05dcf7f8bfab1a13358149bb887d1ba5b82d0d7dc60f72fe03d6067450dac6f8e61665d0b4ee85ad74b71f5de48af6e6cb172cc8cff342399ec1b6e -EBUILD libffi-3.2.1.ebuild 1979 BLAKE2B 1c09607c862083825aa3314dcea2ec77fe5f10d947c69d9bbb245262095fda9b925fba6ee075f2a1978b714b32a46e84788903b0479d2ebd5eca69f1205d0c79 SHA512 168e0f14c7ec739242c7f32dfe5bf0edb7dcd0d85cc00fae39dc4e58ec62e39562759556e0d4c7d800b1d1ec6f1bdc38e19ed9603972ab6049b5f82009515cce -MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90 diff --git a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch deleted file mode 100644 index e5f100e56726..000000000000 --- a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=513428 -https://bugs.gentoo.org/show_bug.cgi?id=536764 -https://trac.macports.org/ticket/44170 - ---- libffi-3.2.1/src/x86/win32.S -+++ libffi-3.2.1/src/x86/win32.S -@@ -1184,7 +1184,6 @@ - - #if defined(X86_WIN32) && !defined(__OS2__) - .section .eh_frame,"w" --#endif - .Lframe1: - .LSCIE1: - .long .LECIE1-.LASCIE1 /* Length of Common Information Entry */ -@@ -1343,6 +1342,7 @@ - /* End of DW_CFA_xxx CFI instructions. */ - .align 4 - .LEFDE5: -+#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */ - - #endif /* !_MSC_VER */ - diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch b/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch deleted file mode 100644 index fd5c1ea4b282..000000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch +++ /dev/null @@ -1,41 +0,0 @@ -ia64: fix small struct handling (missing complex type entry) - -commit 6e8a4460833594d5af1b4539178025da0077df19 -added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER) - -ia64 ffi_closure_unix reiles on the ordering of -types as ia64 has ia64-specific FFI types: -small struct and others. - -As a result all tests handling small structs broke. - -The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX. -This has positive effect of unbreaking most tests: - - === libffi Summary === - --# of expected passes 1595 --# of unexpected failures 295 -+# of expected passes 1930 -+# of unexpected failures 10 - # of unsupported tests 30 - -Bug: https://bugs.gentoo.org/634190 ---- a/src/ia64/unix.S -+++ b/src/ia64/unix.S -@@ -529,6 +529,7 @@ ffi_closure_unix: - data8 @pcrel(.Lst_int64) // FFI_TYPE_SINT64 - data8 @pcrel(.Lst_void) // FFI_TYPE_STRUCT - data8 @pcrel(.Lst_int64) // FFI_TYPE_POINTER -+ data8 @pcrel(.Lst_void) // FFI_TYPE_COMPLEX (not implemented) - data8 @pcrel(.Lst_small_struct) // FFI_IA64_TYPE_SMALL_STRUCT - data8 @pcrel(.Lst_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT - data8 @pcrel(.Lst_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE -@@ -550,6 +551,7 @@ ffi_closure_unix: - data8 @pcrel(.Lld_int) // FFI_TYPE_SINT64 - data8 @pcrel(.Lld_void) // FFI_TYPE_STRUCT - data8 @pcrel(.Lld_int) // FFI_TYPE_POINTER -+ data8 @pcrel(.Lld_void) // FFI_TYPE_COMPLEX (not implemented) - data8 @pcrel(.Lld_small_struct) // FFI_IA64_TYPE_SMALL_STRUCT - data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT - data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch deleted file mode 100644 index 5e8c943eee38..000000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100 -+++ b/src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 -@@ -279,6 +279,7 @@ - .gprel32 $load_64 # FFI_TYPE_SINT64 - .gprel32 $load_none # FFI_TYPE_STRUCT - .gprel32 $load_64 # FFI_TYPE_POINTER -+ .gprel32 $load_none # FFI_TYPE_COMPLEX - - /* Assert that the table above is in sync with ffi.h. */ - -@@ -294,7 +295,8 @@ - || FFI_TYPE_SINT64 != 12 \ - || FFI_TYPE_STRUCT != 13 \ - || FFI_TYPE_POINTER != 14 \ -- || FFI_TYPE_LAST != 14 -+ || FFI_TYPE_COMPLEX != 15 \ -+ || FFI_TYPE_LAST != 15 - #error "osf.S out of sync with ffi.h" - #endif - diff --git a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch b/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch deleted file mode 100644 index 6e21f3566bc9..000000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sat, 17 Feb 2018 19:00:40 +0000 -Subject: [PATCH 2/2] ia64: fix small struct return - -This change fixes libffi.call/struct10.c failure on ia64: -FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test - -.Lst_small_struct handles returns for structs less than 32 bytes -(following ia64 return value ABI [1]). Subroutine does roughly the -following: - -``` - mov [sp+0] = r8 - mov [sp+8] = r9 - mov [sp+16] = r10 - mov [sp+24] = r11 - memcpy(destination, source=sp, 12); -``` - -The problem: ia64 ABI guarantees that top 16 bytes of stack are -scratch space for callee function. Thus it can clobber it. [1] -says (7.1 Procedure Frames): -""" -* Scratch area. This 16-byte region is provided as scratch storage - for procedures that are called by the current procedure. Leaf - procedures do not need to allocate this region. A procedure may - use the 16 bytes at the top of its own frame as scratch memory, - but the contents of this area are not preserved by a procedure call. -""" - -In our case 16 top bytes are clobbered by a PLT resolver when memcpy() -is called for the first time. As a result memcpy implementation reads -already clobbered data frop top of stack. - -The fix is simple: allocate 16 bytes of scrats space prior to memcpy() -call. - -[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf - -Bug: https://bugs.gentoo.org/634190 -Signed-off-by: Sergei Trofimovich ---- - src/ia64/unix.S | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/ia64/unix.S b/src/ia64/unix.S -index 4733377..e2547e0 100644 ---- a/src/ia64/unix.S -+++ b/src/ia64/unix.S -@@ -175,7 +175,6 @@ ffi_call_unix: - ;; - - .Lst_small_struct: -- add sp = -16, sp - cmp.lt p6, p0 = 8, in3 - cmp.lt p7, p0 = 16, in3 - cmp.lt p8, p0 = 24, in3 -@@ -191,6 +190,12 @@ ffi_call_unix: - (p8) st8 [r18] = r11 - mov out1 = sp - mov out2 = in3 -+ ;; -+ // ia64 software calling convention requires -+ // top 16 bytes of stack to be scratch space -+ // PLT resolver uses that scratch space at -+ // 'memcpy' symbol reolution time -+ add sp = -16, sp - br.call.sptk.many b0 = memcpy# - ;; - mov ar.pfs = loc0 --- -2.16.1 - diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch deleted file mode 100644 index 522e1fa9c486..000000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch +++ /dev/null @@ -1,56 +0,0 @@ -Autogenerated part of libffi-3.2.1-include-path.patch - -https://bugs.gentoo.org/643582 -diff --git a/include/Makefile.in b/include/Makefile.in -index 9d747e8..99ecfd7 100644 ---- a/include/Makefile.in -+++ b/include/Makefile.in -@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \ --am__installdirs = "$(DESTDIR)$(includesdir)" --HEADERS = $(nodist_includes_HEADERS) -+am__installdirs = "$(DESTDIR)$(includedir)" -+HEADERS = $(nodist_include_HEADERS) -@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h --includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include --nodist_includes_HEADERS = ffi.h ffitarget.h -+nodist_include_HEADERS = ffi.h ffitarget.h -@@ -360 +359 @@ clean-libtool: --install-nodist_includesHEADERS: $(nodist_includes_HEADERS) -+install-nodist_includeHEADERS: $(nodist_include_HEADERS) -@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) -- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \ -+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ -@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) -- echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ -@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) -- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \ -- $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \ -+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ -+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ -@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) --uninstall-nodist_includesHEADERS: -+uninstall-nodist_includeHEADERS: -@@ -378 +377 @@ uninstall-nodist_includesHEADERS: -- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \ -+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ -@@ -380 +379 @@ uninstall-nodist_includesHEADERS: -- dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir) -+ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -@@ -468 +467 @@ installdirs: -- for dir in "$(DESTDIR)$(includesdir)"; do \ -+ for dir in "$(DESTDIR)$(includedir)"; do \ -@@ -522 +521 @@ info-am: --install-data-am: install-nodist_includesHEADERS -+install-data-am: install-nodist_includeHEADERS -@@ -566 +565 @@ ps-am: --uninstall-am: uninstall-nodist_includesHEADERS -+uninstall-am: uninstall-nodist_includeHEADERS -@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS -- install-nodist_includesHEADERS install-pdf install-pdf-am \ -+ install-nodist_includeHEADERS install-pdf install-pdf-am \ -@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS -- uninstall-am uninstall-nodist_includesHEADERS -+ uninstall-am uninstall-nodist_includeHEADERS diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch deleted file mode 100644 index e1269b2398a4..000000000000 --- a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://bugs.gentoo.org/643582 - -From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001 -From: Yen Chi Hsuan -Date: Sun, 13 Nov 2016 19:17:19 +0800 -Subject: [PATCH] Install public headers in the standard path - ---- - include/Makefile.am | 3 +-- - libffi.pc.in | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/Makefile.am b/include/Makefile.am -index bb241e8..c59df9f 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h - noinst_HEADERS=ffi_common.h ffi_cfi.h - EXTRA_DIST=ffi.h.in - --includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include --nodist_includes_HEADERS = ffi.h ffitarget.h -+nodist_include_HEADERS = ffi.h ffitarget.h -diff --git a/libffi.pc.in b/libffi.pc.in -index edf6fde..6fad83b 100644 ---- a/libffi.pc.in -+++ b/libffi.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - toolexeclibdir=@toolexeclibdir@ --includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includedir=@includedir@ - - Name: @PACKAGE_NAME@ - Description: Library supporting Foreign Function Interfaces --- -2.15.1 - 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/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild deleted file mode 100644 index 20b4510e96ba..000000000000 --- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 - "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch - "${FILESDIR}"/${PN}-3.1-darwin-x32.patch - "${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch - "${FILESDIR}"/${PN}-3.2.1-include-path.patch - "${FILESDIR}"/${PN}-3.2.1-include-path-autogen.patch -) - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - default - - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - # python does not like miltilib-wrapped headers: bug #643582 - # thus we install includes into ABI-specific paths - local includes="${EPREFIX}"/usr/$(get_libdir)/${P}/include/ - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) \ - --includedir="${includes}" -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild deleted file mode 100644 index 3661338c6afc..000000000000 --- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 - "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch - "${FILESDIR}"/${PN}-3.1-darwin-x32.patch - "${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch - "${FILESDIR}"/${PN}-3.2.1-include-path.patch - "${FILESDIR}"/${PN}-3.2.1-include-path-autogen.patch - "${FILESDIR}"/${PN}-3.2.1-ia64-small-struct.patch #634190 -) - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - default - - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - # python does not like miltilib-wrapped headers: bug #643582 - # thus we install includes into ABI-specific paths - local includes="${EPREFIX}"/usr/$(get_libdir)/${P}/include/ - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) \ - --includedir="${includes}" -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild deleted file mode 100644 index c6f9feea53e0..000000000000 --- a/dev-libs/libffi/libffi-3.2.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/" -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug pax_kernel static-libs test" - -RDEPEND="" -DEPEND="test? ( dev-util/dejagnu )" - -DOCS="ChangeLog* README" - -ECONF_SOURCE=${S} - -pkg_setup() { - # Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then - local base="${T}"/conftest - echo 'int main() { }' > "${base}".c - $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null - if [ $? -eq 0 ]; then - eerror "The linker reported linking against -lffi to be working while it shouldn't have." - eerror "This is wrong and you should find and delete the old copy of libffi before continuing." - die "The system is in inconsistent state with unknown libffi installed." - fi - fi -} - -src_prepare() { - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - epatch "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 - epatch "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch - epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch - epatch "${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch - epatch_user - elibtoolize -} - -multilib_src_configure() { - use userland_BSD && export HOST="${CHOST}" - econf \ - $(use_enable static-libs static) \ - $(use_enable pax_kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - prune_libtool_files - einstalldocs -} diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml deleted file mode 100644 index d8fae30b11e1..000000000000 --- a/dev-libs/libffi/metadata.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - toolchain@gentoo.org - Gentoo Toolchain Project - - - Compilers for high level languages generate code that follow certain - conventions. These conventions are necessary, in part, for separate - compilation to work. One such convention is the "calling - convention". The "calling convention" is essentially a set of - assumptions made by the compiler about where function arguments will - be found on entry to a function. A "calling convention" also specifies - where the return value for a function is found. - - Some programs may not know at the time of compilation what arguments - are to be passed to a function. For instance, an interpreter may be - told at run-time about the number and types of arguments used to call - a given function. Libffi can be used in such programs to provide a - bridge from the interpreter program to compiled code. - - The libffi library provides a portable, high level programming - interface to various calling conventions. This allows a programmer to - call any function specified by a call interface description at run - time. - - Ffi stands for Foreign Function Interface. A foreign function - interface is the popular name for the interface that allows code - written in one language to call code written in another language. The - libffi library really only provides the lowest, machine dependent - layer of a fully featured foreign function interface. A layer must - exist above libffi that handles type conversions for values passed - between the two languages. - - - Use PaX emulated trampolines, for we can't use PROT_EXEC - - -- cgit v1.2.3