Support building when fts and obstack aren't part of libc.

- Make configure.ac test for fts and obstack availability;
- Add fts and obstack ldflags to all files that need them;
- Add missing argp ldflags to programs in debuginfod/.

Signed-off-by: Érico Rolim <erico.erc@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 128da6c6b0464b0e83b64811ed57abab409ead8b..565d021c46940283e322d301d23156dabbd86f34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-11-01  Érico N. Rolim  <erico.erc@gmail.com>
+
+       * configure.ac: Check for fts and obstack from outside libc.
+
 2020-10-28  Mark Wielaard  <mark@klomp.org>
 
        * configure.ac: Set version to 0.182.

diff --git a/configure.ac b/configure.ac
index 515ac70495995b466ac37bc0bb2284f9b502face..c1a6954da24572680f8b73edeb9a890674f422e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -542,6 +542,26 @@ else
 fi
 AC_SUBST([argp_LDADD])
 
+saved_LIBS="$LIBS"
+AC_SEARCH_LIBS([fts_close], [fts])
+LIBS="$saved_LIBS"
+case "$ac_cv_search_fts_close" in
+        no) AC_MSG_FAILURE([failed to find fts_close]) ;;
+        -l*) fts_LIBS="$ac_cv_search_fts_close" ;;
+        *) fts_LIBS= ;;
+esac
+AC_SUBST([fts_LIBS])
+
+saved_LIBS="$LIBS"
+AC_SEARCH_LIBS([_obstack_free], [obstack])
+LIBS="$saved_LIBS"
+case "$ac_cv_search__obstack_free" in
+        no) AC_MSG_FAILURE([failed to find obstack_free]) ;;
+        -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;;
+        *) obstack_LIBS= ;;
+esac
+AC_SUBST([obstack_LIBS])
+
 dnl The directories with content.
 
 dnl Documentation.

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 34363e7e01399aa710acb433d0f37f1feda8fc2f..c4164557ee814444186549c20b7a7bd5be98cba2 100644 (file)
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-01  Érico N. Rolim  <erico.erc@gmail.com>
+
+       * Makefile.am (debuginfod_LDADD): Add argp_LDADD and fts_LIBS.
+       (debuginfod_find_LDADD): Likewise.
+       (libdebuginfod_so_LDLIBS): Add fts_LIBS.
+
 2020-10-31  Frank Ch. Eigler  <fche@redhat.com>
 
        * debuginfod.cxx (scan_source_file, scan_archive_file): Add new scanned_bytes_total,

diff --git a/debuginfod/Makefile.am b/debuginfod/Makefile.am
index 01985600ed3b36b8e381a3aad2a4f24e89adcf80..0af3b58c4131dfce76db675a345d66447fce145c 100644 (file)
--- a/debuginfod/Makefile.am
+++ b/debuginfod/Makefile.am
@@ -71,10 +71,10 @@ bin_PROGRAMS += debuginfod-find
 endif
 
 debuginfod_SOURCES = debuginfod.cxx
-debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
+debuginfod_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS) $(libmicrohttpd_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl
 
 debuginfod_find_SOURCES = debuginfod-find.c
-debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod)
+debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS)
 
 if LIBDEBUGINFOD
 noinst_LIBRARIES = libdebuginfod.a
@@ -98,7 +98,7 @@ libdebuginfod_so_LIBS = libdebuginfod_pic.a
 if DUMMY_LIBDEBUGINFOD
 libdebuginfod_so_LDLIBS =
 else
-libdebuginfod_so_LDLIBS = $(libcurl_LIBS)
+libdebuginfod_so_LDLIBS = $(libcurl_LIBS) $(fts_LIBS)
 endif
 libdebuginfod.so$(EXEEXT): $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS)
        $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 289bb4c9faff7f456f4daec99f31004ccf4a63ff..6f8ebea692e7a31c3901b17b80a8aacddebf9bbc 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2020-11-01  Érico N. Rolim  <erico.erc@gmail.com>
+
+       * Makefile.am (libdw_so_LDLIBS): Add fts_LIBS.
+
 2020-10-28  Tom Tromey  <tom@tromey.com>
 
        PR26773

diff --git a/libdw/Makefile.am b/libdw/Makefile.am
index 33b5838dc4e1f314f830ca00eae7a7959d242c23..1dbb3d5ed3e32a4e337aa3fa32d7c44716f69ae6 100644 (file)
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \
                ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
                ../libdwfl/libdwfl_pic.a
 libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LIBS) $(obstack_LIBS) $(zip_LIBS) -pthread
 libdw_so_SOURCES =
 libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
        $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f923c5d6a5f96484bfc1a858f327256831d52b4..ab7ae3f6146bfd1f2502c9c2da38f95fa5cb8e4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-01  Érico N. Rolim  <erico.erc@gmail.com>
+
+       * Makefile.am (nm_LDADD): Add obstack_LIBS.
+       (ranlib_LDADD): Likewise.
+       (ar_LDADD): Likewise.
+
 2020-10-27  Érico N. Rolim  <erico.erc@gmail.com>
 
        * unstrip.c (make_directories): Use strndup, not strndupa.

diff --git a/src/Makefile.am b/src/Makefile.am
index e462e7d7af32e02bb024fa032f58c977052a8f9b..88d0ac8ff0dc8957afed290b26c65dceba189399 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,7 @@ ar_no_Wstack_usage = yes
 unstrip_no_Wstack_usage = yes
 
 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD)
-nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) \
+nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS) \
           $(demanglelib)
 size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
 strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
@@ -78,9 +78,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
 addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
 elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
 objdump_LDADD  = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
-ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
+ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
 strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
-ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
+ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
 unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
 stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib)
 elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)