Enforce DL_LIBS value instead of hard coded -ldl
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 2/2 Enforce DL_LIBS value instead of hard coded -ldl
Generated makefiles would ignore DL_LIBS value selected by configure script and use the hard coded value -ldl. Generated makefiles will now use DL_LIBS.
Refs: #1165
Signed-off-by Yannick Lamarre <[email protected]>
--- src/common/testpoint/Makefile.am | 2 +- tests/regression/ust/baddr-statedump/Makefile.am | 2 +- tests/regression/ust/ust-dl/Makefile.am | 2 +- tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
src/common/testpoint/Makefile.am +1 -1
@@ -1,4 +1,4 @@ noinst_LTLIBRARIES = libtestpoint.la libtestpoint_la_SOURCES = testpoint.h testpoint.c -libtestpoint_la_LIBADD = -ldl +libtestpoint_la_LIBADD = $(DL_LIBS)
tests/regression/ust/baddr-statedump/Makefile.am +1 -1
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(srcdir) -g noinst_PROGRAMS = prog prog_SOURCES = prog.c tp.c tp.h -prog_LDADD = -llttng-ust -ldl +prog_LDADD = -llttng-ust $(DL_LIBS) noinst_SCRIPTS = test_baddr-statedump test_baddr-statedump.py EXTRA_DIST = test_baddr-statedump test_baddr-statedump.py
tests/regression/ust/ust-dl/Makefile.am +1 -1
@@ -19,7 +19,7 @@ AM_CPPFLAGS += -I$(srcdir) -g noinst_PROGRAMS = prog prog_SOURCES = prog.c -prog_LDADD = -ldl +prog_LDADD = $(DL_LIBS) noinst_LTLIBRARIES = libzzz.la libbar.la libfoo.la libtp.la
tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am +1 -1
@@ -3,7 +3,7 @@ BUILT_SOURCES = foobar_provider.h noinst_PROGRAMS = userspace-probe-sdt-binary userspace_probe_sdt_binary_SOURCES = userspace-probe-sdt-binary.c sema.h sema.c -userspace_probe_sdt_binary_LDADD = foobar_provider.o libfoo.la libbar.la -ldl +userspace_probe_sdt_binary_LDADD = foobar_provider.o libfoo.la libbar.la $(DL_LIBS) userspace_probe_sdt_binary_CFLAGS = -I$(abs_builddir) nodist_userspace_probe_sdt_binary_SOURCES = $(abs_builddir)/foobar_provider.h
Signature · 1 line
2.11.0
Re: [PATCH lttng-tools v3 1/2] Fix: Add POPT_CFLAGS to lttng_CFLAGS
In reply to a message not in the archiveThe first patch was merged in master, stable-2.11, and stable-2.10. The second patch was merged in master and stable-2.11.
Thanks!
Jérémie
Quoted 64 lines · Yannick Lamarre
The generated makefile was ignoring
POPT_CFLAGSwhen compiling lttng, but was addingPOPT_LIBStolttng_LDADD. With this commit, make now honors both settings for applications and tests.Fixes #1165Signed-off-by Yannick Lamarre <[email protected]>--- src/bin/lttng/Makefile.am | 2 ++ tests/regression/kernel/Makefile.am | 2 +- tests/regression/ust/multi-lib/Makefile.am | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-)src/bin/lttng/Makefile.am +2
-0@@ -28,6 +28,8 @@ lttng_SOURCES = command.h conf.c conf.h commands/start.c \ commands/disable_rotation.c \ utils.c utils.h lttng.c +lttng_CFLAGS = $(AM_CFLAGS) $(POPT_CFLAGS) + lttng_LDADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/src/common/config/libconfig.la \tests/regression/kernel/Makefile.am +1
-1@@ -7,7 +7,7 @@ EXTRA_DIST = test_event_basic test_all_events test_syscall \ noinst_PROGRAMS = select_poll_epoll select_poll_epoll_SOURCES = select_poll_epoll.c select_poll_epoll_LDADD = $(POPT_LIBS) -select_poll_epoll_CFLAGS = -fno-stack-protector -D_FORTIFY_SOURCE=0 $(AM_CFLAGS) +select_poll_epoll_CFLAGS = $(POPT_CFLAGS) -fno-stack-protector -D_FORTIFY_SOURCE=0 $(AM_CFLAGS) all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \tests/regression/ust/multi-lib/Makefile.am +4
-4@@ -3,13 +3,13 @@ EXTRA_DIST = test_multi_lib noinst_PROGRAMS = exec-with-callsites exec-without-callsites exec_with_callsites_SOURCES = multi-lib-test.c callsites.c -exec_with_callsites_LDFLAGS = -ldl -lpopt -exec_with_callsites_CFLAGS = $(AM_CFLAGS) -DHAS_CALLSITES=1 +exec_with_callsites_LDFLAGS = -ldl $(POPT_LIBS) +exec_with_callsites_CFLAGS = $(POPT_CFLAGS) $(AM_CFLAGS) -DHAS_CALLSITES=1 exec_without_callsites_SOURCES = multi-lib-test.c -exec_without_callsites_LDFLAGS = -ldl -lpopt -llttng-ust +exec_without_callsites_LDFLAGS = -ldl $(POPT_LIBS) -llttng-ust exec_without_callsites_LDADD = probes.o -exec_without_callsites_CFLAGS = $(AM_CFLAGS) -DHAS_CALLSITES=0 +exec_without_callsites_CFLAGS = $(POPT_CFLAGS) $(AM_CFLAGS) -DHAS_CALLSITES=0 PROBES_SRC=probes.c probes.h PROBES_LDF=-shared -module -llttng-ust -avoid-version -rpath $(abs_builddir)/.libs/Signature · 1 line
2.11.0