gentoo auto-resync : 11:04:2025 - 08:43:58HEADmaster

4 files changed, 68 insertions, 4 deletions

diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index e8409cede96e..df32eb351061 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,8 +1,9 @@
 AUX ffcall-2.4-slibtool.patch 5050 BLAKE2B 45db7c7c1dcbbcad4860e99806cc4e2a260877df5d122872964f94c968ea63b231e2f44426d9b0836fe9eccc8e9056ced77eaae9b38ad6f5248d1ce5a808c2d1 SHA512 36df8951ff2f33b06bcf479cf6e5e7b445dae613551f02f4d8af9792781baad60ab48de290068487b265185361a9615b0eeccbb636eedb6c5ffa54bd1b85ee78
 AUX ffcall-2.4-vacall-riscv-pic.patch 16090 BLAKE2B db91cee446d8542d48b7bc33cc134e572cb4d4901bb756ba7d4541ddfdb76fec829e1626d2cfab6d79f6d4d5ca5488e87a3e9b08dda4a99250bdb55ca598ebe7 SHA512 360c6abae6c617bad70d68800065980ca06bc68eb855f6d4c976d11ca7d3f22a12eaa9dd6c00c6ee4596748984011827ba0bb6ed4614c338ca8ea72d283a17ef
+AUX ffcall-2.5-add-support-for-clang.patch 2071 BLAKE2B bf74d0bd53ea79d417d8362a981c8df9429803a4ae15e397fdade049a517c6c3f247b4dfc0720f4068aff646eb557f0920e357339c8d8e846db276603eac702b SHA512 988395aa8d3c03b9e59f78688d845a401090de09738387595617beea4ff70c1694c5a3340c9eb7bfe0440ee79546761a836c54461e4dac728f7a04ff74b73469
 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
 DIST libffcall-2.5.tar.gz 1451999 BLAKE2B 552a0a33bbed91380ced4bdb0f87f38be0a531e729b9530d80dd777ce93b4fe3515a984c2da0221e0110756fbbc099d666b1fed6f5cfacfccbedda7f97e58054 SHA512 5e5b1c34b9e66bde00e1deea464099ef09e439070e8180c04f2520442933e369e76632346ae59a5720356128787e88255bd75764736ac9b5334a592eb6cf5878
 EBUILD ffcall-2.4-r1.ebuild 1630 BLAKE2B 2e5b662fb270eba863d831c6d27ed4405d2288fe505acc01eeeef407395ccd0c36f95decad2d71ca491164c8add183f2003e9cfc195702812b40dd4e0a9df162 SHA512 1ecf15e944ef23e12368499453f8106ecff69c2d5856296488c05985c256ad790bcd7598c11219a49d2ff8b2b9df318e4b9210b7c1d63ec5ccbae506e6f56602
 EBUILD ffcall-2.4.ebuild 1560 BLAKE2B a78adc67982e5e4bfc9f4cb3ea111f956fd712d45e0944a9fb46a0af4d288ed6252317d5321ba4db4338e3ce155d340661c1f35e2b37c91d16f3f1804daf7a99 SHA512 d50da56b5d0219ed0e4b2878272df9fb3270ddda99cf7bdf715e1b7a946b609a0b729bc2865364c07dbaaa3674422632bff7d76ba82baa1c37020f31926ea9a1
-EBUILD ffcall-2.5.ebuild 1443 BLAKE2B 823451abe95b288323f3e212fd361af88f9e4fbea3e489ac0ccdbe9194ccd973a0a2c63845f7abb01cd8ad50faacf0cb2580314987e436ae989acd16a62254f7 SHA512 782cb77d98d9886a03c7a6588c60a73a2dd5ca4e509973a77098a5a44d70304fa89eff6cbcc0f8679cbf6d12ce8714e67502d8e4f485d814a9c2d899c40817d5
-MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0
+EBUILD ffcall-2.5.ebuild 1612 BLAKE2B 6f0cc411ac9c15e120f9bfd5cf0d2fcd564c07f17f1d1c9b34bfa081c306f4545ccbc4bf6556d1bfb120a25321555df2f424809d3e4c748d784b43b3b0201edd SHA512 a1e1bad3a73893c2385b783f8beb3319de62067099194e51ff3f1a74a34cbcc3330aa8928b44c06885b5c742385a3ce128b5941cfa5bf2180fdd32187e0f7f98
+MISC metadata.xml 866 BLAKE2B 9a835c7bf2579a98d7d547f376347ff2c67445bf041d4392ba0c18261b5ed29b7b015db45f61aa70b99ccadb706088ac84a381948540a9390256394950605eb4 SHA512 bb83f9b791d8de4fb680a64f4164720caabc1f953edfedfdfd7a17c2f6e167b6f6987dda37e3a59f32b772c511015a153f7d93fe39d9cde51f9c6e4bb56b6083
diff --git a/dev-libs/ffcall/ffcall-2.5.ebuild b/dev-libs/ffcall/ffcall-2.5.ebuild
index 7f9d8f6bfae9..2ab0965e1c5c 100644
--- a/dev-libs/ffcall/ffcall-2.5.ebuild
+++ b/dev-libs/ffcall/ffcall-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool
+inherit autotools flag-o-matic libtool
 
 MY_PV="libffcall-${PV}"
 
@@ -19,6 +19,10 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
+PATCHES=(
+	"${FILESDIR}"/ffcall-2.5-add-support-for-clang.patch
+)
+
 src_prepare() {
 	# The build system is a strange mix of autogenerated
 	# files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly.
@@ -35,6 +39,12 @@ src_prepare() {
 
 	default
 	elibtoolize
+	eautoreconf
+
+	if use kernel_linux ; then
+		QA_CONFIG_IMPL_DECL_SKIP=( PROT_MPROTECT )
+	fi
+
 }
 
 src_configure() {
diff --git a/dev-libs/ffcall/files/ffcall-2.5-add-support-for-clang.patch b/dev-libs/ffcall/files/ffcall-2.5-add-support-for-clang.patch
new file mode 100644
index 000000000000..2a8cc2676401
--- /dev/null
+++ b/dev-libs/ffcall/files/ffcall-2.5-add-support-for-clang.patch
@@ -0,0 +1,53 @@
+https://git.savannah.gnu.org/cgit/libffcall.git/commit/?id=fe6d9f089d8326b077420c10fec8c2174557be30
+
+From fe6d9f089d8326b077420c10fec8c2174557be30 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Tue, 20 Aug 2024 13:38:19 +0200
+Subject: [PATCH] Add support for Android.
+
+* m4/cc-gcc.m4 (CL_CC_GCC): If using clang as compiler, add the option
+-no-integrated-as to GCC_X_NONE.
+* NEWS: Mention Android as supported.
+
+diff --git a/m4/cc-gcc.m4 b/m4/cc-gcc.m4
+index 1e12d8e..97c2dac 100644
+--- a/m4/cc-gcc.m4
++++ b/m4/cc-gcc.m4
+@@ -1,5 +1,5 @@
+ dnl -*- Autoconf -*-
+-dnl Copyright (C) 1993-2017 Free Software Foundation, Inc.
++dnl Copyright (C) 1993-2024 Free Software Foundation, Inc.
+ dnl This file is free software, distributed under the terms of the GNU
+ dnl General Public License as published by the Free Software Foundation;
+ dnl either version 2 of the License, or (at your option) any later version.
+@@ -27,6 +27,27 @@ AC_DEFUN([CL_CC_GCC],
+   if test $cl_cv_prog_cc_gcc = yes; then
+     CC_GCC=true
+     GCC_X_NONE='-x none'
++
++    dnl On arm, there are two slightly different syntaxes for assembly language:
++    dnl The "divided" syntax (standard since ca. 2000) and the "unified" syntax
++    dnl (supported by GNU binutils since 2009).  See
++    dnl https://sourceware.org/binutils/docs/as/ARM_002dInstruction_002dSet.html
++    dnl While GNU as and thus GCC supports both, clang by default uses an
++    dnl "integrated" assembler that supports only the "unified" syntax, leading
++    dnl to errors "error: invalid instruction" on instructions such as stmeqia.
++    dnl We therefore need to tell clang to use the external assembler.
++    AC_CACHE_CHECK([whether using clang], [cl_cv_prog_cc_clang],
++      [AC_EGREP_CPP([yes],
++         [#ifdef __clang__
++          yes
++          #endif
++         ],
++         [cl_cv_prog_cc_clang=yes],
++         [cl_cv_prog_cc_clang=no])
++      ])
++    if test $cl_cv_prog_cc_clang = yes; then
++      GCC_X_NONE="$GCC_X_NONE -no-integrated-as"
++    fi
+   else
+     CC_GCC=false
+     GCC_X_NONE=''
+-- 
+2.45.2
+
diff --git a/dev-libs/ffcall/metadata.xml b/dev-libs/ffcall/metadata.xml
index 8f3e6241df19..0ce3519235e9 100644
--- a/dev-libs/ffcall/metadata.xml
+++ b/dev-libs/ffcall/metadata.xml
@@ -25,6 +25,6 @@ callback
 - closures with variable arguments as first-class C functions (a reentrant combination of vacall and trampoline) 
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">clisp</remote-id>
+		<remote-id type="cpe">cpe:/a:gnu:libffcall</remote-id>
 	</upstream>
 </pkgmetadata>