From: Kienan Stewart Date: Fri, 13 Dec 2024 19:14:21 +0000 (-0500) Subject: liblttng-ctl: Re-expose several `config_str_*` variables X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=856f55813bab5793384a09e9d731942cc98374f1;p=lttng-tools.git liblttng-ctl: Re-expose several `config_str_*` variables 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 Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f11d2b834..d6c5f37b1 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -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