Re: [PATCH] build: make building with --coverage work again

From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: jengelh@inai.de
Cc: "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
Subject: Re: [PATCH] build: make building with --coverage work again
Date: Thu, 29 Nov 2018 13:57:01 +0200	[thread overview]
Message-ID: <CABBYNZ+Wqp5wFnTLuduAzJ7-k_hS+0H4T_JCfVuxYNtH0b6qnw@mail.gmail.com> (raw)
In-Reply-To: <20181128154514.17315-1-jengelh@inai.de>

Hi Jan,
On Wed, Nov 28, 2018 at 5:45 PM Jan Engelhardt <jengelh@inai.de> wrote:
>
> When `./configure --enable-coverage` is given and lcov is present,
> MISC_CFLAGS and MISC_LDFLAGS will be set to --coverage. However,
>
> 1. obexd uses per-target LDFLAGS and, in doing so, forget to re-mention
> $(AM_LDFLAGS). This problem existed for a long time.
>
> 2. obexd uses per-target CFLAGS and, in doing so, forgot to re-mention
> $(AM_CFLAGS). This got broken in 06dbb223fbe50acc48b3ba1d33cb424275b4baaa.
>
> This led to no --coverage showing up in the linker line for obexd,
> causing a link failure indicating unresolved symbols like
> __gcov_exit.
> ---
>  Makefile.obexd      | 6 +++---
>  android/Makefile.am | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile.obexd b/Makefile.obexd
> index 22a4977ef..1c1e500fe 100644
> --- a/Makefile.obexd
> +++ b/Makefile.obexd
> @@ -81,15 +81,15 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
>                         gdbus/libgdbus-internal.la \
>                         $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl
>
> -obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic
> +obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
>
> -obexd_src_obexd_CPPFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
> +obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
>                                 $(ICAL_CFLAGS) -DOBEX_PLUGIN_BUILTIN \
>                                 -DPLUGINDIR=\""$(obex_plugindir)"\" \
>                                 -D_FILE_OFFSET_BITS=64 \
>                                 -I$(builddir)/lib -I$(builddir)/obexd/src
>
> -obexd_src_obexd_CFLAGS = -fPIC
> +obexd_src_obexd_CFLAGS = $(AM_CFLAGS) -fPIC
>
>  endif
>
> diff --git a/android/Makefile.am b/android/Makefile.am
> index 5dd1adf9d..a370598a2 100644
> --- a/android/Makefile.am
> +++ b/android/Makefile.am
> @@ -142,7 +142,7 @@ android_haltest_SOURCES = android/client/haltest.c \
>                                 android/hal-utils.h android/hal-utils.c
>  android_haltest_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/android \
>                                 -DPLUGINDIR=\""$(android_plugindir)"\"
> -android_haltest_LDFLAGS = -pthread
> +android_haltest_LDFLAGS = $(AM_LDFLAGS) -pthread
>  android_haltest_LDADD = -ldl -lm
>
>  noinst_PROGRAMS += android/android-tester
> @@ -167,7 +167,7 @@ android_android_tester_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/android \
>                                 -DPLUGINDIR=\""$(android_plugindir)"\"
>  android_android_tester_LDADD = lib/libbluetooth-internal.la \
>                                 src/libshared-glib.la $(GLIB_LIBS) -ldl
> -android_android_tester_LDFLAGS = -pthread
> +android_android_tester_LDFLAGS = $(AM_LDFLAGS) -pthread
>
>  noinst_PROGRAMS += android/ipc-tester
>
> --
> 2.19.1

Applied, thanks.

-- 
Luiz Augusto von Dentz