]> git.lttng.org Git - lttng-tools.git/commitdiff
liblttng-ctl: Re-expose several `config_str_*` variables
authorKienan Stewart <kstewart@efficios.com>
Fri, 13 Dec 2024 19:14:21 +0000 (14:14 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Thu, 16 Jan 2025 19:20:41 +0000 (19:20 +0000)
Observed issue
==============

The diff of the ABI of liblttng-ctl between lttng-tools 2.13 and
master shows the following removed variables:

```

```
7 Removed variables:

  [D] 'const char* const config_str_false'    {config_str_false}
  [D] 'const char* const config_str_no'    {config_str_no}
  [D] 'const char* const config_str_off'    {config_str_off}
  [D] 'const char* const config_str_on'    {config_str_on}
  [D] 'const char* const config_str_true'    {config_str_true}
  [D] 'const char* const config_str_yes'    {config_str_yes}
  [D] 'log_time error_log_time'    {error_log_time}
```

Cause
=====

The `const_str_*` variables were moved from `session-config.cpp` to
`ini-config.cpp`. Due to license in-compatibility (and probably lack
of immediate need), libini-config was never linked to libconfig-lgpl,
and thus to liblttng-ctl.

Solution
========

Link to libini-config to libconfig.

Known drawbacks
===============

None.

Change-Id: I4fdb15157ca4a7d4ee34dff7d1dcaa44b2e23aef
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/common/Makefile.am

index f11d2b8342d808339d1186206d7d6677e78e49ac..d6c5f37b1745fc9ac4906ad83238a43a08cb6e4a 100644 (file)
@@ -168,7 +168,6 @@ libcommon_gpl_la_SOURCES = \
 libcommon_gpl_la_LIBADD = \
        libcommon-lgpl.la \
        libpath.la \
-       libini-config.la \
        libhashtable-gpl.la \
        libfd-tracker.la
 
@@ -204,7 +203,8 @@ libconfig_la_SOURCES = \
        config/session-config.hpp
 
 libconfig_la_CPPFLAGS = $(libxml2_CFLAGS) $(AM_CPPFLAGS)
-libconfig_la_LIBADD = ${libxml2_LIBS}
+libconfig_la_LIBADD = ${libxml2_LIBS} \
+       libini-config.la
 
 
 if BUILD_LIB_CONSUMER
This page took 0.030455 seconds and 4 git commands to generate.