From b3f2504c1d05b5999b74b2135860fc721e3adf68 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Jul 2022 07:41:50 +0100 Subject: gentoo auto-resync : 15:07:2022 - 07:41:50 --- dev-libs/ffcall/Manifest | 2 + dev-libs/ffcall/ffcall-2.4-r1.ebuild | 67 +++++++++++++++++++ dev-libs/ffcall/files/ffcall-2.4-slibtool.patch | 86 +++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 dev-libs/ffcall/ffcall-2.4-r1.ebuild create mode 100644 dev-libs/ffcall/files/ffcall-2.4-slibtool.patch (limited to 'dev-libs/ffcall') diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest index 3f84350425f1..3fa5d4d466ac 100644 --- a/dev-libs/ffcall/Manifest +++ b/dev-libs/ffcall/Manifest @@ -1,6 +1,8 @@ +AUX ffcall-2.4-slibtool.patch 5050 BLAKE2B 45db7c7c1dcbbcad4860e99806cc4e2a260877df5d122872964f94c968ea63b231e2f44426d9b0836fe9eccc8e9056ced77eaae9b38ad6f5248d1ce5a808c2d1 SHA512 36df8951ff2f33b06bcf479cf6e5e7b445dae613551f02f4d8af9792781baad60ab48de290068487b265185361a9615b0eeccbb636eedb6c5ffa54bd1b85ee78 AUX ffcall-2.4-vacall-riscv-pic.patch 16090 BLAKE2B db91cee446d8542d48b7bc33cc134e572cb4d4901bb756ba7d4541ddfdb76fec829e1626d2cfab6d79f6d4d5ca5488e87a3e9b08dda4a99250bdb55ca598ebe7 SHA512 360c6abae6c617bad70d68800065980ca06bc68eb855f6d4c976d11ca7d3f22a12eaa9dd6c00c6ee4596748984011827ba0bb6ed4614c338ca8ea72d283a17ef DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6 EBUILD ffcall-2.1.ebuild 1465 BLAKE2B 94c45c5e0c32ef02e7eeb1922466dabb4c5ad239e992403796e84a803fb2901384da0b029af539b8d71d960e207530de48bc49a72ecdd7143721d0982af76e13 SHA512 4b4fd2c30aaa9e7039e3797df97ad9947f960ba22d65fc5ae1a8d6c57c1cf6ad04ea6726249d3e2fcb34940ebf30b2c15f270f19b79dea9dd2e8b0fabdce062c +EBUILD ffcall-2.4-r1.ebuild 1648 BLAKE2B 63bc28b5cefed8c1eaba88e5af218cda15376e2d424cd975190179791f079574a1fec592b14317d08415fbb14b70fa2a3ea3e74d6c62fdb8b0c7359069e3b6ed SHA512 d0bdc6147c06256933903ce0865094fed2c893c72faa13b858dfb2685f98ea04c3940263ab3a5ba501f9a3ff20822bcc908e1c3a652e66daad5ba9b4b83daa8e EBUILD ffcall-2.4.ebuild 1594 BLAKE2B d5698aba91126067627ddb9a88f525e248bffecc7ef49288f8dff1f7c32746a4dd0d9f421bac6ede0f5d0130434a69771e7c38ef457eab46911361b374025e90 SHA512 27ff8105f30e2c1f3fe76e2c125cfb1b25870bb18471bacc642ca203ee6059f10f3292e2ed4f06ac40e128cbbe1619d3fc7e1985059d56d5d844da684c62b6dd MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0 diff --git a/dev-libs/ffcall/ffcall-2.4-r1.ebuild b/dev-libs/ffcall/ffcall-2.4-r1.ebuild new file mode 100644 index 000000000000..370cad023a20 --- /dev/null +++ b/dev-libs/ffcall/ffcall-2.4-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +MY_PV="libffcall-${PV}" + +DESCRIPTION="Build foreign function call interfaces in embedded interpreter" +HOMEPAGE="https://www.gnu.org/software/libffcall/" +SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz" +S="${WORKDIR}"/${MY_PV} + +# "Ffcall is under GNU GPL. As a special exception, if used in GNUstep +# or in derivate works of GNUstep, the included parts of ffcall are +# under GNU LGPL." -ffcall author +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + +PATCHES=( + # bug 842915, drop on next version bump + "${FILESDIR}"/${PN}-2.4-vacall-riscv-pic.patch + "${FILESDIR}"/${PN}-2.4-slibtool.patch # 776976 +) + +src_prepare() { + # The build system is a strange mix of autogenerated + # files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly. + # We are adding them consistently here and a bit over the top: + # bugs: #334581 + local mfi + for mfi in {,*/,*/*/,}Makefile.in ; do + einfo "Patching '${mfi}'" + # usually uses only assembler here, but -march= + # and -Wa, are a must to pass here. + sed -e 's/$(CC) /&$(CFLAGS) /g' \ + -i "${mfi}" || die + done + + default +} + +src_configure() { + append-flags -fPIC + + # Doc goes in datadir + econf \ + --datadir="${EPREFIX}"/usr/share/doc/${PF} \ + --enable-shared \ + --disable-static +} + +src_compile() { + # TODO. Remove -j1 + emake -j1 +} + +src_install() { + dodoc NEWS README + dodir /usr/share/man + + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/ffcall/files/ffcall-2.4-slibtool.patch b/dev-libs/ffcall/files/ffcall-2.4-slibtool.patch new file mode 100644 index 000000000000..73c896c4f211 --- /dev/null +++ b/dev-libs/ffcall/files/ffcall-2.4-slibtool.patch @@ -0,0 +1,86 @@ +Bug: https://bugs.gentoo.org/776976 +Upstream-ML: https://lists.gnu.org/archive/html/libffcall/2022-07/msg00000.html + +From: orbea +Date: Wed, 13 Jul 2022 17:45:05 -0700 +Subject: [PATCH] build: Fix the build with slibtool + +Using symlinks to create dummy .lo files does not work with slibtool +which tries to find the corresponding .o file which doesn't exist. + +Its better to use the real .lo file instead. +--- a/Makefile.in ++++ b/Makefile.in +@@ -2,6 +2,8 @@ + + #### Start of system configuration section. #### + ++CPU = @HOST_CPU_C_ABI@ ++ + # Directories used by "make": + srcdir = @srcdir@ + +@@ -69,8 +71,8 @@ ffcall-version.h : $(srcdir)/ffcall-version.in.h + ffcall-version.lo : $(srcdir)/ffcall-version.c ffcall-version.h config.h + $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/ffcall-version.c + +-libffcall.la : ffcall-version.lo avcall/avcall.lo avcall/avcall-libapi.lo avcall/avcall-structcpy.lo callback/vacall_r/libvacall.la callback/trampoline_r/libtrampoline.la callback/callback-libapi.lo +- $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(CFLAGS) -o libffcall.la -rpath $(libdir) -no-undefined -export-symbols-regex $(LIBFFCALL_EXPORTED_SYMBOLS_REGEX) -version-info $(LIBFFCALL_VERSION_INFO) ffcall-version.lo avcall/avcall.lo avcall/avcall-libapi.lo avcall/avcall-structcpy.lo callback/vacall_r/vacall.lo callback/vacall_r/vacall-libapi.lo callback/vacall_r/vacall-structcpy.lo callback/trampoline_r/*.lo callback/callback-libapi.lo gnulib-lib/libgnu.la $(LDFLAGS) $(LTLIBTHREAD) ++libffcall.la : ffcall-version.lo avcall/avcall-$(CPU).lo avcall/avcall-libapi.lo avcall/avcall-structcpy.lo callback/vacall_r/libvacall.la callback/trampoline_r/libtrampoline.la callback/callback-libapi.lo ++ $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(CFLAGS) -o libffcall.la -rpath $(libdir) -no-undefined -export-symbols-regex $(LIBFFCALL_EXPORTED_SYMBOLS_REGEX) -version-info $(LIBFFCALL_VERSION_INFO) ffcall-version.lo avcall/avcall-$(CPU).lo avcall/avcall-libapi.lo avcall/avcall-structcpy.lo callback/vacall_r/vacall-$(CPU).lo callback/vacall_r/vacall-libapi.lo callback/vacall_r/vacall-structcpy.lo callback/trampoline_r/*.lo callback/callback-libapi.lo gnulib-lib/libgnu.la $(LDFLAGS) $(LTLIBTHREAD) + + install : force + mkdir -p $(DESTDIR)$(prefix) +--- a/avcall/Makefile.in ++++ b/avcall/Makefile.in +@@ -58,7 +58,7 @@ SHELL = /bin/sh + # Needed by $(LIBTOOL). + top_builddir = .. + +-OBJECTS = avcall.lo avcall-libapi.lo avcall-structcpy.lo avcall-compat.lo ++OBJECTS = avcall-$(CPU).lo avcall-libapi.lo avcall-structcpy.lo avcall-compat.lo + + # Limit the set of exported symbols, on those platforms where libtool supports it. + # Currently this does not exclude any symbol; maybe sometime in the future... +@@ -70,11 +70,6 @@ LIBAVCALL_VERSION_INFO = 2:0:1 + + all : $(OBJECTS) libavcall.la $(srcdir)/avcall.3 $(srcdir)/avcall.html + +-avcall.lo : avcall-$(CPU).lo +- $(RM) avcall.lo avcall.@OBJEXT@ +- $(LN) avcall-$(CPU).lo avcall.lo +- if test -f avcall-$(CPU).@OBJEXT@; then $(LN) avcall-$(CPU).@OBJEXT@ avcall.@OBJEXT@; fi +- + @IFNOT_MSVC@avcall-i386.lo : avcall-i386.s + @IFNOT_MSVC@ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c avcall-i386.s + +--- a/callback/Makefile.in ++++ b/callback/Makefile.in +@@ -77,7 +77,7 @@ callback-compat.lo : $(srcdir)/callback-compat.c ../config.h + $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/callback-compat.c + + libcallback.la : vacall_r/libvacall.la trampoline_r/libtrampoline.la callback-libapi.lo callback-compat.lo +- $(LIBTOOL_LINK) $(CC) $(CFLAGS) -o libcallback.la -rpath $(libdir) -no-undefined -export-symbols-regex $(LIBCALLBACK_EXPORTED_SYMBOLS_REGEX) -version-info $(LIBCALLBACK_VERSION_INFO) vacall_r/vacall.lo vacall_r/vacall-libapi.lo vacall_r/vacall-structcpy.lo trampoline_r/*.lo callback-libapi.lo callback-compat.lo ../gnulib-lib/libgnu.la $(LDFLAGS) $(LTLIBTHREAD) ++ $(LIBTOOL_LINK) $(CC) $(CFLAGS) -o libcallback.la -rpath $(libdir) -no-undefined -export-symbols-regex $(LIBCALLBACK_EXPORTED_SYMBOLS_REGEX) -version-info $(LIBCALLBACK_VERSION_INFO) vacall_r/vacall-$(CPU).lo vacall_r/vacall-libapi.lo vacall_r/vacall-structcpy.lo trampoline_r/*.lo callback-libapi.lo callback-compat.lo ../gnulib-lib/libgnu.la $(LDFLAGS) $(LTLIBTHREAD) + + # Installs the library and include files only. Typically called with only + # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. +--- a/callback/vacall_r/Makefile.in ++++ b/callback/vacall_r/Makefile.in +@@ -54,15 +54,10 @@ SHELL = /bin/sh + # Needed by $(LIBTOOL). + top_builddir = ../.. + +-OBJECTS = vacall.lo vacall-libapi.lo vacall-structcpy.lo ++OBJECTS = vacall-$(CPU).lo vacall-libapi.lo vacall-structcpy.lo + + all : $(OBJECTS) libvacall.la + +-vacall.lo : vacall-$(CPU).lo +- $(RM) vacall.lo vacall.@OBJEXT@ +- $(LN) vacall-$(CPU).lo vacall.lo +- if test -f vacall-$(CPU).@OBJEXT@; then $(LN) vacall-$(CPU).@OBJEXT@ vacall.@OBJEXT@; fi +- + @IFNOT_MSVC@vacall-i386.lo : vacall-i386.s + @IFNOT_MSVC@ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c vacall-i386.s + -- cgit v1.2.3