From patchwork Fri Feb 22 19:33:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yannick Lamarre X-Patchwork-Id: 2076802 X-Patchwork-Delegate: jgalar@efficios.com From: ylamarre at efficios.com (Yannick Lamarre) Date: Fri, 22 Feb 2019 14:33:37 -0500 Subject: [lttng-dev] [PATCH lttng-tools v3 1/2] Fix: Add POPT_CFLAGS to lttng_CFLAGS Message-ID: <20190222193338.7240-1-ylamarre@efficios.com> The generated makefile was ignoring POPT_CFLAGS when compiling lttng, but was adding POPT_LIBS to lttng_LDADD. With this commit, make now honors both settings for applications and tests. Fixes: #1165 Signed-off-by: Yannick Lamarre --- 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(-) diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am index b0e1247d..62ae0593 100644 --- a/src/bin/lttng/Makefile.am +++ b/src/bin/lttng/Makefile.am @@ -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 \ diff --git a/tests/regression/kernel/Makefile.am b/tests/regression/kernel/Makefile.am index a787e4fa..3ab6d75b 100644 --- a/tests/regression/kernel/Makefile.am +++ b/tests/regression/kernel/Makefile.am @@ -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 \ diff --git a/tests/regression/ust/multi-lib/Makefile.am b/tests/regression/ust/multi-lib/Makefile.am index 3fb4ae74..17ccf3e6 100644 --- a/tests/regression/ust/multi-lib/Makefile.am +++ b/tests/regression/ust/multi-lib/Makefile.am @@ -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/ From patchwork Fri Feb 22 19:33:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yannick Lamarre X-Patchwork-Id: 2076803 X-Patchwork-Delegate: jgalar@efficios.com From: ylamarre at efficios.com (Yannick Lamarre) Date: Fri, 22 Feb 2019 14:33:38 -0500 Subject: [lttng-dev] [PATCH lttng-tools v3 2/2] Enforce DL_LIBS value instead of hard coded -ldl In-Reply-To: <20190222193338.7240-1-ylamarre@efficios.com> References: <20190222193338.7240-1-ylamarre@efficios.com> Message-ID: <20190222193338.7240-2-ylamarre@efficios.com> 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 --- 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(-) diff --git a/src/common/testpoint/Makefile.am b/src/common/testpoint/Makefile.am index 5c15725e..a2f9d407 100644 --- a/src/common/testpoint/Makefile.am +++ b/src/common/testpoint/Makefile.am @@ -1,4 +1,4 @@ noinst_LTLIBRARIES = libtestpoint.la libtestpoint_la_SOURCES = testpoint.h testpoint.c -libtestpoint_la_LIBADD = -ldl +libtestpoint_la_LIBADD = $(DL_LIBS) diff --git a/tests/regression/ust/baddr-statedump/Makefile.am b/tests/regression/ust/baddr-statedump/Makefile.am index bf327179..bf51f948 100644 --- a/tests/regression/ust/baddr-statedump/Makefile.am +++ b/tests/regression/ust/baddr-statedump/Makefile.am @@ -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 diff --git a/tests/regression/ust/ust-dl/Makefile.am b/tests/regression/ust/ust-dl/Makefile.am index 9889e85a..c51e072f 100644 --- a/tests/regression/ust/ust-dl/Makefile.am +++ b/tests/regression/ust/ust-dl/Makefile.am @@ -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 diff --git a/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am b/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am index e86939b4..d79ce0ea 100644 --- a/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am +++ b/tests/utils/testapp/userspace-probe-sdt-binary/Makefile.am @@ -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