openharmony/third_party_elfutils
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_elfutils.git synced 2026-07-21 15:55:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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>
This commit is contained in:
Érico Rolim
2020-11-01 21:48:50 -03:00
committed by Mark Wielaard
parent b503c358dd
commit da855fc9cd
8 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -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.
configure.ac
+20
View File
@@ -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.
debuginfod/ChangeLog
+6
View File
@@ -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,
debuginfod/Makefile.am
+3 -3
View File
@@ -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 $@ \
libdw/ChangeLog
+4
View File
@@ -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
libdw/Makefile.am
+1 -1
View File
@@ -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 $@ \
src/ChangeLog
+6
View File
@@ -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.
src/Makefile.am
+3 -3
View File
@@ -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)