From 05e8ff1f80c9a6dcd7db559c7a39b4c46e85e2a7 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 23 Feb 2021 15:31:48 -0500 Subject: [PATCH] Bump soname major to 1 The event notifier (trigger) feature required a significant rework of public data structures which should never have been made public in the first place. Bump the soname major to 1, which will require applications and tracepoint providers to rebuild against an updated lttng-ust to use it. Old applications and tracepoint providers linked against libraries with major soname 0 should be able to co-exist on the same system. Now (before the next release) is a good time to eliminate LTTng-UST APIs which were made public by accident. Signed-off-by: Mathieu Desnoyers Change-Id: I804c875ab7c0ae30daaab4817614574ccebc26c8 --- configure.ac | 2 +- include/lttng/tracepoint.h | 4 ++-- liblttng-ust-cyg-profile/Makefile.am | 4 ++++ liblttng-ust-dl/Makefile.am | 1 + liblttng-ust-fd/Makefile.am | 2 ++ liblttng-ust-fork/Makefile.am | 2 ++ liblttng-ust-libc-wrapper/Makefile.am | 4 ++++ 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7c7bf26e..d2dc3769 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH]) # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # This is the library version of liblttng-ust. -m4_define([UST_LIB_V_MAJOR], [0]) +m4_define([UST_LIB_V_MAJOR], [1]) m4_define([UST_LIB_V_MINOR], [0]) m4_define([UST_LIB_V_PATCH], [0]) diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 41ac5a28..51eafdeb 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -349,7 +349,7 @@ __tracepoints__init(void) tracepoint_dlopen_ptr = &tracepoint_dlopen; if (!tracepoint_dlopen_ptr->liblttngust_handle) tracepoint_dlopen_ptr->liblttngust_handle = - dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL); + dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL); if (!tracepoint_dlopen_ptr->liblttngust_handle) return; __tracepoint__init_urcu_sym(); @@ -471,7 +471,7 @@ __tracepoints__ptrs_init(void) tracepoint_dlopen_ptr = &tracepoint_dlopen; if (!tracepoint_dlopen_ptr->liblttngust_handle) tracepoint_dlopen_ptr->liblttngust_handle = - dlopen("liblttng-ust-tracepoint.so.0", RTLD_NOW | RTLD_GLOBAL); + dlopen("liblttng-ust-tracepoint.so.1", RTLD_NOW | RTLD_GLOBAL); if (!tracepoint_dlopen_ptr->liblttngust_handle) return; if (!tracepoint_destructors_syms_ptr) diff --git a/liblttng-ust-cyg-profile/Makefile.am b/liblttng-ust-cyg-profile/Makefile.am index a3a2ff92..14c2080e 100644 --- a/liblttng-ust-cyg-profile/Makefile.am +++ b/liblttng-ust-cyg-profile/Makefile.am @@ -11,6 +11,8 @@ liblttng_ust_cyg_profile_la_LIBADD = \ $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) +liblttng_ust_cyg_profile_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) + liblttng_ust_cyg_profile_fast_la_SOURCES = \ lttng-ust-cyg-profile-fast.c \ lttng-ust-cyg-profile-fast.h @@ -19,4 +21,6 @@ liblttng_ust_cyg_profile_fast_la_LIBADD = \ $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) +liblttng_ust_cyg_profile_fast_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) + dist_noinst_SCRIPTS = run run-fast diff --git a/liblttng-ust-dl/Makefile.am b/liblttng-ust-dl/Makefile.am index 8df6eb57..16eefe37 100644 --- a/liblttng-ust-dl/Makefile.am +++ b/liblttng-ust-dl/Makefile.am @@ -11,3 +11,4 @@ liblttng_ust_dl_la_LIBADD = \ $(DL_LIBS) liblttng_ust_dl_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-dl $(AM_CFLAGS) +liblttng_ust_dl_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/liblttng-ust-fd/Makefile.am b/liblttng-ust-fd/Makefile.am index f253c61f..b8b6a73d 100644 --- a/liblttng-ust-fd/Makefile.am +++ b/liblttng-ust-fd/Makefile.am @@ -9,3 +9,5 @@ liblttng_ust_fd_la_LIBADD = \ $(DL_LIBS) liblttng_ust_fd_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fd $(AM_CFLAGS) + +liblttng_ust_fd_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/liblttng-ust-fork/Makefile.am b/liblttng-ust-fork/Makefile.am index de318c92..af4e5ca3 100644 --- a/liblttng-ust-fork/Makefile.am +++ b/liblttng-ust-fork/Makefile.am @@ -7,3 +7,5 @@ liblttng_ust_fork_la_LIBADD = \ $(DL_LIBS) liblttng_ust_fork_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fork $(AM_CFLAGS) + +liblttng_ust_fork_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am index 12e81966..d4ecea3d 100644 --- a/liblttng-ust-libc-wrapper/Makefile.am +++ b/liblttng-ust-libc-wrapper/Makefile.am @@ -11,6 +11,8 @@ liblttng_ust_libc_wrapper_la_LIBADD = \ $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) +liblttng_ust_libc_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) + liblttng_ust_pthread_wrapper_la_SOURCES = \ lttng-ust-pthread.c \ ust_pthread.h @@ -19,5 +21,7 @@ liblttng_ust_pthread_wrapper_la_LIBADD = \ $(top_builddir)/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) +liblttng_ust_pthread_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) + dist_noinst_SCRIPTS = run EXTRA_DIST = README -- 2.34.1