commit: 7edad73b87f266741af3de82a08e84397cdc2c41 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 5 06:39:41 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 5 06:39:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edad73b
dev-libs/libffi: backport fix for exec-static-trampoline Signed-off-by: Sam James <sam <AT> gentoo.org> .../libffi/files/libffi-3.4.4-trampoline-c99.patch | 39 ++++++++++ dev-libs/libffi/libffi-3.4.4-r4.ebuild | 83 ++++++++++++++++++++++ profiles/base/package.use.mask | 4 +- 3 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch b/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch new file mode 100644 index 000000000000..a7728331135e --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch @@ -0,0 +1,39 @@ +https://github.com/libffi/libffi/issues/760 +https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4 + +From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <serge.guel...@telecom-bretagne.eu> +Date: Thu, 2 Feb 2023 14:46:29 +0000 +Subject: [PATCH] Forward declare open_temp_exec_file (#764) + +It's defined in closures.c and used in tramp.c. +Also declare it as an hidden symbol, as it should be. + +Co-authored-by: serge-sans-paille <sguel...@mozilla.com> +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,10 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++ ++#include <ffi.h> ++#include <ffi_common.h> ++ + #include <stdio.h> + #include <unistd.h> + #include <stdlib.h> + diff --git a/dev-libs/libffi/libffi-3.4.4-r4.ebuild b/dev-libs/libffi/libffi-3.4.4-r4.ebuild new file mode 100644 index 000000000000..5304ecb54f9e --- /dev/null +++ b/dev-libs/libffi/libffi-3.4.4-r4.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 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/"; +SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"; +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="debug exec-static-trampoline pax-kernel static-libs test" + +RESTRICT="!test? ( test )" +BDEPEND="test? ( dev-util/dejagnu )" + +PATCHES=( + "${FILESDIR}"/${P}-hppa-large-struct.patch + "${FILESDIR}"/${P}-hppa-closure-function-ptrs.patch + "${FILESDIR}"/${P}-hppa-jump-table.patch + "${FILESDIR}"/${P}-sparc-float-typo.patch + "${FILESDIR}"/${P}-lld-17.patch + "${FILESDIR}"/${P}-trampoline-c99.patch +) + +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_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/profiles/base/package.use.mask b/profiles/base/package.use.mask index e03b7a1fa32f..4a0351abdaef 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # New entries go on top. @@ -210,7 +210,7 @@ sys-libs/libomp llvm_targets_AMDGPU # Sam James <s...@gentoo.org> (2023-01-21) # Fails to compile: https://github.com/libffi/libffi/issues/760 -dev-libs/libffi exec-static-trampoline +<dev-libs/libffi-3.4.4-r4 exec-static-trampoline # Joonas Niilola <juip...@gentoo.org> (2023-01-08) # Doesn't compile currently, bug #853094.
