diff options
Diffstat (limited to 'dev-libs/libffi')
| -rw-r--r-- | dev-libs/libffi/Manifest | 7 | ||||
| -rw-r--r-- | dev-libs/libffi/files/libffi-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch | 38 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-3.4.6-r3.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-3.4.7.ebuild | 87 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-9999.ebuild | 6 |
5 files changed, 136 insertions, 4 deletions
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index acd471b171c5..2446ae3559dd 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -16,11 +16,14 @@ AUX libffi-3.4.6-sparc-struct-targs.patch 1440 BLAKE2B 5a9485f30b6f165e1121bbec4 AUX libffi-3.4.6-test-typo.patch 765 BLAKE2B 3c27254852f6ebb6f879ec9b98ccdcbdf4e2cb06a44a40078a2316924b35098291c9f375eac667939624ddba4542c725c7cdb200f26acb2f3d28420f8256dc45 SHA512 29a2de08179e9928fc235aa5fddf44cde50f72d5ba091b13d73afbc284523c7fec00f2f389b1de32fd78cbb6b90d3b6346a0d1b6b4553095c1fab8bc22fe326e AUX libffi-3.4.6-tests.patch 3398 BLAKE2B a3a6e7d1800ff27cb3bcfabd0a656ae47bfdcd3996083b4847bb7a78e2bc9256423bb8272663181227450996308dc4c73a9dc20d38ed6872c3b04aadfdf56439 SHA512 1153bf4cb32f5dfa873e11c932986a49cae2b48e6cfd04dba09f95399da8d19d0efdefe3b24e7a39970290513578db3170b9184f3f334ca03a0ad969fea5ff00 AUX libffi-3.4.6-x86-sse.patch 3535 BLAKE2B d6d3a0f16fa69ced4d1c6667e784ecae293415d21d807bbf245152c57b7b2cc14ece57471c43797232b1bab90139e31a518d4a0af050c79f25d75c0981bd2475 SHA512 bb47364794bc17bad6447c243c5b72f05645e236f3bf0a45ab7b6aa16acf392d9a993efed6cd70c795319bc4c4330f8f6df67a477fc5c00253b5f87c7ef9b4f1 +AUX libffi-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch 1177 BLAKE2B bc0f4638c3a527eaa5cac8fd73a50fd0e2edad2ba4e288c3fa30eaeaab5b6f31d88f9552d70aaa2677a941696af101ea2d6f0d3288d9451ff2f917e98aedcec2 SHA512 7cf5f0c228529121b518c64ff2f13381e2d9a940e310bce345a23d63c19ce120d5905c2de5de6b2f507f1dbece741401709fb552c6564f3ba849e445a66f32d1 DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 DIST libffi-3.4.6.tar.gz 1391684 BLAKE2B af8402a09bdbd59b4e9400d2d71bd5ce98f6f1d981d35d1ab40d77a831b13b32c5bd34ca54ff75999e39f0d8a9c066381fae7a8d6c5216d955e064f929f08b88 SHA512 033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39 +DIST libffi-3.4.7.tar.gz 1393979 BLAKE2B 0dd17b4fd358beb9842889168437443137445a5dba1f0a7e8669ae420d8efb927815c08602c1b1b141acfdfdbaa12b417863402a5c8df5f36519fd3e772d3f37 SHA512 d19f59a5b5d61bd7d9e8a7a74b8bf2e697201a19c247c410c789e93ca8678a4eb9f13c9bee19f129be80ade8514f6b1acb38d66f44d86edd32644ed7bbe31dd6 EBUILD libffi-3.4.4-r4.ebuild 2540 BLAKE2B 6a85dd1d002e6ec61c57a4d5db58a20ff58e987da7ceb6630abfdd08ebd9f2fad574c29ab10d7a623310bb61b161e4c26c23a5d26af91e67bfa193d191e8a822 SHA512 f5d4049d6e5fe432321df11c0295a7bc579212eb5db54613d0ecc986975bdae1d9f26b9abcd9949db7e2efe156f4e5c9f8a90d870b9cf380308a848ad533c747 EBUILD libffi-3.4.6-r2.ebuild 2858 BLAKE2B 34b481067c36cc8bdabe8e1ce75443d0c3c776c5b85530aa0b0afe8b8c162c0dc14d8f255fe154c46d83553677ee5f8e9ad36ea336ad72326b373e00939a567c SHA512 c7d035d7aa67ee230d2050c9b3e63d3d75821e6a679f07799204f0bec12e9254def244abef0b7e98550221e6ac6ac3e6abfaddab6b35e687c5b386af4cc41680 -EBUILD libffi-3.4.6-r3.ebuild 2798 BLAKE2B ad5cef3fdf2b91ebbaada2f9b917cc179ab32750582f8f55648357336a5291119f8fa2b07ec1500d2dbb1e40134ac99d941cb65528c208ab4f8dbea437396719 SHA512 b429dffb3ca124a6a392b55bb9e7c61555dd1824b82140523e0de74289b0841b24d9d11f11ca40f8d99fe33c642b567a9736a2f7455f9519cc2f7db92b39ec9d +EBUILD libffi-3.4.6-r3.ebuild 2792 BLAKE2B d903460a6ad4e4726db1c868e1476399e56f3ab88d583aa9b7077f6bb0775602c89896189da2268b9810419f559b21914ecc814e1dc9cc598fa562456bd3e524 SHA512 f0eebc4f1a9bb9781f7d7f4cd84ab8e4149730f787898d77240adb52bcc671d77f3e1b4bbb8b474136067bca8370d68eb2b1dbba55339f90b2c10678d765386c EBUILD libffi-3.4.6.ebuild 2270 BLAKE2B a8af8687618bc1541f71db585727f33228b96c446729761accd7e2dc3ebd59de141e629371b97a3e7fc6e7c412f4696a7cac7e02ca8c271e103747f7c9d439b4 SHA512 6447b4fd561836bee7cd7148f1b2fdf7e100ffa292a1e94051aca03ed19acf5446f1db74241e6ecc445317f272b3773930f1184f25588658aa12234472897ce0 -EBUILD libffi-9999.ebuild 2434 BLAKE2B 92ace4cdabf80f2f920c9137140a2f81520413359f21714640d3ce0dfa9d39ea66d0e2e653dfd1c9566448a688ec4406a012f0d0c9c6fc374bccdd0fa4e4a183 SHA512 f0e0133ed6bf82f97289b002546e8777d9a38873b47d691fcbeb2ce0167c850e246307783dba13258fa8225ef278b5ad809cb7fec8dda50337f3290dc4551c6a +EBUILD libffi-3.4.7.ebuild 2534 BLAKE2B b834d3f2d3a44149e2d32068eac6072c373ee417cec4a28bf43682d8b80fe7a3deff4a69e31259e4372f9b12f270faa8d2df8e9425fab7d1af5a1ca57d7a78d9 SHA512 cf4af86505759d8d9ab948988a71bfebde8ca46f86a6cc71e77312a40aaa17916e4e1adc2d77a7f549c2abed0ae46e6518977883e3d34d263f9e7f7d18c53e3d +EBUILD libffi-9999.ebuild 2534 BLAKE2B b834d3f2d3a44149e2d32068eac6072c373ee417cec4a28bf43682d8b80fe7a3deff4a69e31259e4372f9b12f270faa8d2df8e9425fab7d1af5a1ca57d7a78d9 SHA512 cf4af86505759d8d9ab948988a71bfebde8ca46f86a6cc71e77312a40aaa17916e4e1adc2d77a7f549c2abed0ae46e6518977883e3d34d263f9e7f7d18c53e3d MISC metadata.xml 2110 BLAKE2B 2653be2cf09c047e45e489d7265d00165ddab2f94744988e4e8bca449bd1e40eeab74cb0b8d7d47a2d8b73563869460fcccb06e1fbccad697a9f213be362cb03 SHA512 e1a280792b929d38451fea1eb360053ed3a452592094f3e327ce4a4ff7eb8e0119435e8ee98f215585d8d98440512b5b68f92d1cd472a3bfd12e2f382e1981a1 diff --git a/dev-libs/libffi/files/libffi-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch b/dev-libs/libffi/files/libffi-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch new file mode 100644 index 000000000000..a8958b2fefdc --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch @@ -0,0 +1,38 @@ +From 4354fe1434a37b781ff19f5a6be51ec4e982ad5a Mon Sep 17 00:00:00 2001 +Message-ID: <4354fe1434a37b781ff19f5a6be51ec4e982ad5a.1739062746.git.sam@gentoo.org> +From: Sam James <sam@gentoo.org> +Date: Sun, 9 Feb 2025 00:54:28 +0000 +Subject: [PATCH] Revert "Fix x86/ffi64 calls with 6 gp and some sse registers + (#848)" + +This reverts commit d21881f55ed4a44d464c9091871e69b0bb47611a. + +Bug: https://github.com/libffi/libffi/issues/879 +Bug: https://bugs.gentoo.org/949051 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/src/x86/ffi64.c ++++ b/src/x86/ffi64.c +@@ -654,7 +654,7 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue, + break; + default: + reg_args->gpr[gprcount] = 0; +- memcpy (®_args->gpr[gprcount], a, sizeof(UINT64)); ++ memcpy (®_args->gpr[gprcount], a, size); + } + gprcount++; + break; +--- a/testsuite/libffi.call/struct_int_float.c ++++ b/testsuite/libffi.call/struct_int_float.c +@@ -5,6 +5,7 @@ + Originator: kellda */ + + /* { dg-do run } */ ++/* { dg-skip-if "libffi bug #879" { *-*-* } { "*" } } */ + #include "ffitest.h" + + typedef struct + +base-commit: 1716f81e9a115d340429504563bc8e7fb2eeef2b +-- +2.48.1 + diff --git a/dev-libs/libffi/libffi-3.4.6-r3.ebuild b/dev-libs/libffi/libffi-3.4.6-r3.ebuild index e8471b2b545b..91b74d8b3c1a 100644 --- a/dev-libs/libffi/libffi-3.4.6-r3.ebuild +++ b/dev-libs/libffi/libffi-3.4.6-r3.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} diff --git a/dev-libs/libffi/libffi-3.4.7.ebuild b/dev-libs/libffi/libffi-3.4.7.ebuild new file mode 100644 index 000000000000..072cb92af743 --- /dev/null +++ b/dev-libs/libffi/libffi-3.4.7.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal preserve-libs + +MY_PV=${PV/_rc/-rc} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/libffi/libffi" + inherit autotools git-r3 +else + SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +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 +IUSE="debug +exec-static-trampoline pax-kernel static-libs test" + +RESTRICT="!test? ( test )" +BDEPEND="test? ( dev-util/dejagnu )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch +) + +src_prepare() { + default + + [[ ${PV} == 9999 ]] && eautoreconf + + 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_SOURCE="${S}" 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_test() { + emake -Onone check +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name "*.la" -delete || die +} + +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/libffi-9999.ebuild b/dev-libs/libffi/libffi-9999.ebuild index 0f77bf10562f..072cb92af743 100644 --- a/dev-libs/libffi/libffi-9999.ebuild +++ b/dev-libs/libffi/libffi-9999.ebuild @@ -27,11 +27,15 @@ LICENSE="MIT" # 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 -IUSE="debug exec-static-trampoline pax-kernel static-libs test" +IUSE="debug +exec-static-trampoline pax-kernel static-libs test" RESTRICT="!test? ( test )" BDEPEND="test? ( dev-util/dejagnu )" +PATCHES=( + "${FILESDIR}"/${PN}-3.4.7-Revert-Fix-x86-ffi64-calls-with-6-gp-and-some-sse-re.patch +) + src_prepare() { default |