[PATCH] debuginfod: Fix BUILD_STATIC build.

Mark Wielaard mark@klomp.org
Tue Sep 8 12:14:51 GMT 2020


The BUILD_STATIC build, as used by the coverage setup, was broken for
debuginfod because the DUMMY_LIBDEBUGINFOD case was mixed up. It should
include libcurl_LIBS when NOT doing a dummy build.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 debuginfod/ChangeLog   | 5 +++++
 debuginfod/Makefile.am | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index db8a76a7..bc7c23f4 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-08  Mark Wielaard  <mark@klomp.org>
+
+	* Makefile.am (BUILD_STATIC): Include libcurl_LIBS in libdebuginfod
+	when NOT DUMMY_LIBDEBUGINFOD.
+
 2020-07-03  Alice Zhang <alizhang@redhat.com>
 
 	* debuginfod-client.c (debuginfod_query_server): Use strncasecmp
diff --git a/debuginfod/Makefile.am b/debuginfod/Makefile.am
index 2e8a343c..01985600 100644
--- a/debuginfod/Makefile.am
+++ b/debuginfod/Makefile.am
@@ -46,9 +46,9 @@ libasm = ../libasm/libasm.a
 libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
 libelf = ../libelf/libelf.a -lz
 if DUMMY_LIBDEBUGINFOD
-libdebuginfod = ./libdebuginfod.a $(libcurl_LIBS)
-else
 libdebuginfod = ./libdebuginfod.a
+else
+libdebuginfod = ./libdebuginfod.a $(libcurl_LIBS)
 endif
 else
 libasm = ../libasm/libasm.so
-- 
2.20.1



More information about the Elfutils-devel mailing list