From patchwork Sat Jan 29 19:31:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Seifert X-Patchwork-Id: 50571 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F0F1E3858417 for ; Sat, 29 Jan 2022 19:31:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F0F1E3858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1643484686; bh=8uS4okvFJN7Z1nKXxW3T/hV9bWNj4L+o/L8bM8tUSyc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=cX6u6vHaEJl5A5bI1vWxNH3imjsajuOlye1cmKdzMo90BimIJtxFDf80ZLN5j/LAd ovAFf6jpKFdkpK5UdXiqdQNGbH9t//gRURx2WV0E9hM0jisMXkuCgikVyNaRlfFbx7 AVAHxlM+TAA328mzH15EV3siEhoMRkujk293xeyQ= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 215E53858D28 for ; Sat, 29 Jan 2022 19:31:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 215E53858D28 To: libabigail@sourceware.org Subject: [PATCH] Find fts-standalone on musl Date: Sat, 29 Jan 2022 20:31:07 +0100 Message-Id: <20220129193107.2706650-1-soap@gentoo.org> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Seifert via Libabigail From: David Seifert Reply-To: David Seifert Cc: David Seifert Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Bug: https://bugs.gentoo.org/831571 Signed-off-by: Dodji Seketeli --- configure.ac | 7 +++++++ src/Makefile.am | 4 ++-- tools/Makefile.am | 3 ++- tools/abisym.cc | 1 + tools/kmidiff.cc | 1 - 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 29130175..019bdbac 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,7 @@ dnl check for dependencies dnl ************************************************* AC_PROG_CXX +AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS AC_PROG_INSTALL @@ -219,6 +220,12 @@ 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 dnl at that time elfutils didnt have pkgconfig capabilities diff --git a/src/Makefile.am b/src/Makefile.am index 29da1ecf..1591224f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,12 +46,12 @@ if CTF_READER libabigail_la_SOURCES += abg-ctf-reader.cc endif -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) diff --git a/tools/Makefile.am b/tools/Makefile.am index 648a71b5..f7592b60 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -37,7 +37,8 @@ abicompat_LDADD = $(abs_top_builddir)/src/libabigail.la 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 diff --git a/tools/abisym.cc b/tools/abisym.cc index a8fe19cd..a105e4ff 100644 --- a/tools/abisym.cc +++ b/tools/abisym.cc @@ -12,6 +12,7 @@ #include #include +#include #include #include #include diff --git a/tools/kmidiff.cc b/tools/kmidiff.cc index b802348f..2e88baa7 100644 --- a/tools/kmidiff.cc +++ b/tools/kmidiff.cc @@ -11,7 +11,6 @@ #include #include -#include #include #include #include