libabigail 2.10 requires libxxhash >= 0.8.0, so add xxhash to DEPENDS. Drop 0001-Check-for-correct-fts-module.patch, which is merged in 2.10.
Signed-off-by: Khem Raj <[email protected]> --- .../0001-Check-for-correct-fts-module.patch | 91 ------------------- .../{libabigail_2.5.bb => libabigail_2.10.bb} | 5 +- 2 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch rename meta-oe/recipes-devtools/libabigail/{libabigail_2.5.bb => libabigail_2.10.bb} (70%) 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 deleted file mode 100644 index 7c500e0b54..0000000000 --- a/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 0db4af09f1bf4456527b5f6ec60fc1305e770c4c Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 9 Jul 2024 15:19:35 +0100 -Subject: [PATCH] configure.ac: improve fts checks - -The current code checks explicitly for musl and if so uses pkg-config to -find fts-standalone. This is suboptimal because musl may not be the only -libc to need a standalone fts implementation, and fts-standalone is an -old gentoo-specific name[1] so libabigail won't build on any other system -against musl. - -Instead, use AC_SEARCH_LIBS to look for fts_open in libc then libfts. Do -this before the check for behaviour just in case someone has a standalone -and broken implementation. I assume that the standalone fts is installed -on the standard search path, which should be a fair assumption. - -As we're not using pkg-config anymore the required link flags are now in -LIBS, so remove all instances of FTS_CFLAGS and FTS_LIBS. - -[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/sys-libs/fts-standalone?id=a403fe6c61d1aaeecd58d521f3def2f6d3513449 - -Upstream-Status: Submitted [https://sourceware.org/pipermail/libabigail/2024q3/005973.html] -Signed-off-by: Ross Burton <[email protected]> ---- - configure.ac | 9 ++++----- - src/Makefile.am | 4 ++-- - tools/Makefile.am | 2 -- - 3 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e118a9c0..0aff2ec2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -281,6 +281,10 @@ fi - - AC_SUBST(VISIBILITY_FLAGS) - -+# glibc and BSD include fts into their libc, but musl does not so check if we -+# need to explicitly link to the standalone musl-fts. -+AC_SEARCH_LIBS([fts_open], [fts]) -+ - dnl Older glibc had a broken fts that didn't work with Large File Systems. - dnl We want the version that can handler LFS, but include workaround if we - dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to -@@ -295,11 +299,6 @@ 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 --AS_CASE( -- [${host_os}], [*-musl*], [ -- PKG_CHECK_MODULES([FTS], [fts-standalone]) --]) - - dnl Check for dependency: libelf, libdw, libebl (elfutils) - dnl Note that we need to use at least elfutils 0.159 but -diff --git a/src/Makefile.am b/src/Makefile.am -index 3044c136..1c98bf84 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -52,12 +52,12 @@ if BTF_READER - libabigail_la_SOURCES += abg-btf-reader.cc - endif - --libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS) -+libabigail_la_LIBADD = $(DEPS_LIBS) - libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined -version-info $(LIBABIGAIL_SO_CURRENT):$(LIBABIGAIL_SO_REVISION):$(LIBABIGAIL_SO_AGE) - - CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\" - - AM_CPPFLAGS=\ --$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \ -+$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \ - -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \ - -I$(abs_top_builddir)/include -I$(abs_top_builddir) -diff --git a/tools/Makefile.am b/tools/Makefile.am -index cbb5ce10..ea2d300c 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -41,8 +41,6 @@ abicompatdir = $(bindir) - - abipkgdiff_SOURCES = abipkgdiff.cc - abipkgdiffdir = $(bindir) --abipkgdiff_CPPFLAGS = $(FTS_CFLAGS) --abipkgdiff_LDADD = $(FTS_LIBS) - abipkgdiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la -pthread - - kmidiff_SOURCES = kmidiff.cc --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-oe/recipes-devtools/libabigail/libabigail_2.10.bb similarity index 70% rename from meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb rename to meta-oe/recipes-devtools/libabigail/libabigail_2.10.bb index 5c262d2880..5a84fd6848 100644 --- a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb +++ b/meta-oe/recipes-devtools/libabigail/libabigail_2.10.bb @@ -5,11 +5,10 @@ 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" +SRC_URI[sha256sum] = "0cc10e6471398330e001b9fe37f1e8c5108a9ab632b08ca9634d6c64bc380b78" -DEPENDS = "elfutils libxml2" +DEPENDS = "elfutils libxml2 xxhash" DEPENDS:append:libc-musl = " fts" inherit autotools pkgconfig lib_package
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127854): https://lists.openembedded.org/g/openembedded-devel/message/127854 Mute This Topic: https://lists.openembedded.org/mt/120013651/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
