2 files changed, 50 insertions, 0 deletions

diff --git a/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch
new file mode 100644
index 0000000000..2a9388b766
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch
@@ -0,0 +1,33 @@
+From b6af55e8ae120488abc83312fcd184d8352175eb Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 1 Jul 2024 10:53:45 +0000
+Subject: [PATCH] Check for correct fts module
+
+fts-standalone is a gentoo-specific name[1], every other distribution that
+uses this library has named it musl-fts.
+
+[1] https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild#n34
+
+Upstream-Status: Pending [discussing with libabigail and gentoo]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d329490..5bad2ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -295,10 +295,10 @@ AS_IF([test "x$ac_cv_bad_fts" = "xyes"],
+       [CFLAGS="$CFLAGS -DBAD_FTS=1",
+        CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"])
+ 
+-dnl On musl, we need to find fts-standalone
++dnl On musl, we need to find the standalone fts library
+ AS_CASE(
+   [${host_os}], [*-musl*], [
+-    PKG_CHECK_MODULES([FTS], [fts-standalone])
++    PKG_CHECK_MODULES([FTS], [musl-fts])
+ ])
+ 
+ dnl Check for dependency: libelf, libdw, libebl (elfutils)
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
new file mode 100644
index 0000000000..5c262d2880
--- /dev/null
+++ b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb
@@ -0,0 +1,17 @@
+SUMMARY = "The ABI Generic Analysis and Instrumentation Library"
+HOMEPAGE = "https://sourceware.org/libabigail/"
+
+LICENSE = "Apache-2.0-with-LLVM-exception"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
+
+SRC_URI = "http://mirrors.kernel.org/sourceware/${BPN}/${BP}.tar.xz \
+           file://0001-Check-for-correct-fts-module.patch \
+           "
+SRC_URI[sha256sum] = "7cfc4e9b00ae38d87fb0c63beabb32b9cbf9ce410e52ceeb5ad5b3c5beb111f3"
+
+DEPENDS = "elfutils libxml2"
+DEPENDS:append:libc-musl = " fts"
+
+inherit autotools pkgconfig lib_package
+
+BBCLASSEXTEND = "native nativesdk"