--- a/configure.ac +++ b/configure.ac @@ -143,6 +143,7 @@ dnl ************************************************* AC_PROG_CXX +AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS AC_PROG_INSTALL @@ -201,6 +202,12 @@ [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 dnl at that time elfutils didnt have pkgconfig capabilities --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,12 +41,12 @@ abg-symtab-reader.cc \ $(VIZ_SOURCES) -libabigail_la_LIBADD = $(DEPS_LIBS) +libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS) libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\" AM_CPPFLAGS=\ -$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \ +$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \ -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \ -I$(abs_top_builddir)/include -I$(abs_top_builddir) --- a/tools/abisym.cc +++ b/tools/abisym.cc @@ -11,6 +11,7 @@ /// in its symbol tables and report what it sees. #include +#include #include #include #include --- a/tools/kmidiff.cc +++ b/tools/kmidiff.cc @@ -11,7 +11,6 @@ #include #include -#include #include #include #include --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -37,7 +37,8 @@ abipkgdiff_SOURCES = abipkgdiff.cc abipkgdiffdir = $(bindir) -abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la +abipkgdiff_CPPFLAGS = $(FTS_CFLAGS) +abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la $(FTS_LIBS) abipkgdiff_LDFLAGS = -pthread kmidiff_SOURCES = kmidiff.cc