mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-02 04:11:33 +02:00
67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
From f9323656c27575b2eccd7e85876c897f1c46172e Mon Sep 17 00:00:00 2001
|
|
From: Michael Jeanson <mjeanson@efficios.com>
|
|
Date: Thu, 9 Jun 2016 15:11:32 -0400
|
|
Subject: [PATCH lttng-tools 2/3] Fix: do not link against libtool .o objects
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We should not link against libtool objects directly
|
|
since they have different names in static or shared
|
|
only build. Instead link on the full .la
|
|
|
|
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
|
|
---
|
|
tests/unit/Makefile.am | 13 ++++---------
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
|
|
index 5625cf0..b698107 100644
|
|
--- a/tests/unit/Makefile.am
|
|
+++ b/tests/unit/Makefile.am
|
|
@@ -46,9 +46,7 @@ SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/consumer.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/utils.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
|
|
- $(top_builddir)/src/common/uri.o \
|
|
- $(top_builddir)/src/common/utils.o \
|
|
- $(top_builddir)/src/common/error.o \
|
|
+ $(top_builddir)/src/common/libcommon.la \
|
|
$(top_builddir)/src/common/health/libhealth.la \
|
|
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
|
|
|
|
@@ -72,8 +70,7 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/session.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/snapshot.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/agent.o \
|
|
- $(top_builddir)/src/common/uri.o \
|
|
- $(top_builddir)/src/common/utils.o \
|
|
+ $(top_builddir)/src/common/libcommon.la \
|
|
$(top_builddir)/src/common/health/libhealth.la \
|
|
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
|
|
|
|
@@ -87,8 +84,7 @@ endif
|
|
KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/consumer.o \
|
|
$(top_builddir)/src/bin/lttng-sessiond/utils.o \
|
|
- $(top_builddir)/src/common/uri.o \
|
|
- $(top_builddir)/src/common/utils.o \
|
|
+ $(top_builddir)/src/common/libcommon.la \
|
|
$(top_builddir)/src/common/health/libhealth.la \
|
|
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
|
|
|
|
@@ -98,8 +94,7 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM)
|
|
test_kernel_data_LDADD += $(KERN_DATA_TRACE)
|
|
|
|
# utils suffix for unit test
|
|
-UTILS_SUFFIX=$(top_builddir)/src/common/utils.o \
|
|
- $(top_builddir)/src/common/runas.o
|
|
+UTILS_SUFFIX=$(top_builddir)/src/common/libcommon.la
|
|
|
|
# parse_size_suffix unit test
|
|
test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c
|
|
--
|
|
2.7.4
|
|
|