diff options
| author | Mark Wielaard <mark@klomp.org> | 2023-03-03 17:10:30 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2023-03-03 17:10:30 +0100 |
| commit | ed688a59b4d4f5ccf6ef15244e5a9139f71769a3 (patch) | |
| tree | b05013a8d20af62c7fd04f5d816c66c02f4eded3 | |
| parent | 67a187d4c1790058fc7fd218317851cb68bb087c (diff) | |
| download | elfutils-ed688a59b4d4f5ccf6ef15244e5a9139f71769a3.tar.gz | |
Fix static build when zstd is enabled for libelf
When doing a static build (as with --enable-gcov) the build fails
because the executables aren't linked with -lzstd. Also the
run-debuginfod-query-retry.sh test relies on libdebuginfod.so.1 which
isn't there.
Fix by adding $(zstd_LIBS) to the static libelf lines and using the
debuginfod-find executable itself in the testcase.
* src/Makefile.am (libelf): When BUILD_STATIC add $(zstd_LIBS)
* tests/Makefile.am (libelf): Likewise.
* tests/run-debuginfod-query-retry.sh: Use debuginfod-find instead
of libdebuginfod.so.1
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/run-debuginfod-query-retry.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6cc019da..10d59a48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,7 +42,7 @@ CLEANFILES += make-debug-archive if BUILD_STATIC libasm = ../libasm/libasm.a libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread -libelf = ../libelf/libelf.a -lz +libelf = ../libelf/libelf.a -lz $(zstd_LIBS) else libasm = ../libasm/libasm.so libdw = ../libdw/libdw.so diff --git a/tests/Makefile.am b/tests/Makefile.am index fd58bf84..7e32f117 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -664,7 +664,7 @@ installcheck-local: if BUILD_STATIC libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread -libelf = ../libelf/libelf.a -lz +libelf = ../libelf/libelf.a -lz $(zstd_LIBS) libasm = ../libasm/libasm.a else libdw = ../libdw/libdw.so diff --git a/tests/run-debuginfod-query-retry.sh b/tests/run-debuginfod-query-retry.sh index 2f551ffb..d2cdfd65 100755 --- a/tests/run-debuginfod-query-retry.sh +++ b/tests/run-debuginfod-query-retry.sh @@ -26,7 +26,7 @@ unset VALGRIND_CMD # set up tests for retrying failed queries. retry_attempts=`(testrun env DEBUGINFOD_URLS=http://255.255.255.255/JUNKJUNK DEBUGINFOD_RETRY_LIMIT=10 DEBUGINFOD_VERBOSE=1 DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache \ ${abs_top_builddir}/debuginfod/debuginfod-find debuginfo \ - ${abs_top_builddir}/debuginfod/libdebuginfod.so.1 || true) \ + ${abs_top_builddir}/debuginfod/debuginfod-find || true) \ 2>&1 >/dev/null | grep -c 'Retry failed query'` if [ $retry_attempts -ne 10 ]; then echo "retry mechanism failed." |