From: Jonathan Rajotte Date: Tue, 3 Sep 2019 17:01:09 +0000 (-0400) Subject: Fix: bindings import segfaults on missing hash_key_u64 X-Git-Tag: v2.12.0-rc1~479 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=84f3bd075b45f762b0dea5c1d48bc17a3f3c5365;p=lttng-tools.git Fix: bindings import segfaults on missing hash_key_u64 A mishandled error in SWIG-generated code causes the Python3 interpreter to segfault when a missing symbol is reported during the linking (at runtime) against liblttng-ctl. libcommon makes use of the internal libhashtable.la since the addition of the lttng_trace_chunk interface. This introduces a transitive dependency to libhashtable.la in liblttng-ctl. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4b1484e8b..896e2d6a1 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -39,6 +39,7 @@ endif libcommon_la_LIBADD = \ $(top_builddir)/src/common/config/libconfig.la \ $(top_builddir)/src/common/compat/libcompat.la \ + $(top_builddir)/src/common/hashtable/libhashtable.la \ $(UUID_LIBS) if BUILD_LIB_COMPAT diff --git a/src/lib/lttng-ctl/Makefile.am b/src/lib/lttng-ctl/Makefile.am index 32d0aff54..f79c26e04 100644 --- a/src/lib/lttng-ctl/Makefile.am +++ b/src/lib/lttng-ctl/Makefile.am @@ -14,7 +14,6 @@ liblttng_ctl_la_LDFLAGS = \ liblttng_ctl_la_LIBADD = \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ $(top_builddir)/src/common/libcommon.la \ - $(top_builddir)/src/common/hashtable/libhashtable.la \ $(top_builddir)/src/lib/lttng-ctl/filter/libfilter.la pkgconfigdir = $(libdir)/pkgconfig