[PATCH] libtracefs: Do not show the full version in the library SONAME

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>

The SONAME of the library should point to the same object as the
libtracefs.so does. Since the soft link libtracefs.so points to
libtracefs.so.1, then so should the SONAME of the executable.

Reported-by:  Jan Engelhardt <ej+bko@xxxxxxx>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=210875
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
 scripts/utils.mk | 2 +-
 src/Makefile     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/utils.mk b/scripts/utils.mk
index 7742e19..32a9b3c 100644
--- a/scripts/utils.mk
+++ b/scripts/utils.mk
@@ -56,7 +56,7 @@ do_build_static_lib =				\
 
 do_compile_shared_library =			\
 	($(print_shared_lib_compile)		\
-	$(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS))
+	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LIBS))
 
 do_compile_plugin_obj =				\
 	($(print_plugin_obj_compile)		\
diff --git a/src/Makefile b/src/Makefile
index 52f17af..3f64905 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,7 +17,7 @@ $(LIBTRACEFS_STATIC): $(OBJS)
 	$(Q)$(call do_build_static_lib)
 
 $(LIBTRACEFS_SHARED): $(OBJS)
-	$(Q)$(call do_compile_shared_library)
+	$(Q)$(call do_compile_shared_library,$(notdir $(LIBTRACEFS_SHARED_VERSION)))
 
 $(LIBTRACEFS_SHARED_VERSION): $(LIBTRACEFS_SHARED)
 	@ln -sf $(<F) $@
-- 
2.25.4




[Index of Archives]     [Linux USB Development]     [Linux USB Development]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux