2019-02-12 15:15:25

by Szymon Janc

Subject: [PATCH 1/2] build: Fix missing dependency for btpclient

prog_DEPENDENCIES is computed by automake only if not supplied so we
must provide all dependencies if provided manually.

This resulted in random build failures:

libtool: error: cannot find the library 'lib/libbluetooth-internal.la'
or unhandled argument 'lib/libbluetooth-internal.la'
make[1]: *** [Makefile:5436: tools/btpclient] Error 1
---
Makefile.tools | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.tools b/Makefile.tools
index 1f8271542..0f94bbbe7 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -471,5 +471,5 @@ noinst_PROGRAMS += tools/btpclient
tools_btpclient_SOURCES = tools/btpclient.c src/shared/btp.c src/shared/btp.h
tools_btpclient_LDADD = lib/libbluetooth-internal.la \
src/libshared-ell.la $(ell_ldadd)
-tools_btpclient_DEPENDENCIES = $(ell_dependencies)
+tools_btpclient_DEPENDENCIES = lib/libbluetooth-internal.la $(ell_dependencies)
endif
--
2.20.1

2019-02-12 15:15:26

by Szymon Janc

Subject: [PATCH 2/2] gitignore: Fix bluetooth-meshd name

meshd was renamed to bluetooth-meshd
---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d145ccdcd..68bbbf780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,7 +129,7 @@ emulator/b1ee
emulator/hfp
client/bluetoothctl
tools/meshctl
-mesh/meshd
+mesh/bluetooth-meshd

src/bluetoothd.8
src/bluetooth.service
--
2.20.1

2019-02-13 15:52:10

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] build: Fix missing dependency for btpclient

Hi Szymon,
On Tue, Feb 12, 2019 at 5:18 PM Szymon Janc <[email protected]> wrote:
>
> prog_DEPENDENCIES is computed by automake only if not supplied so we
> must provide all dependencies if provided manually.
>
> This resulted in random build failures:
>
> libtool: error: cannot find the library 'lib/libbluetooth-internal.la'
> or unhandled argument 'lib/libbluetooth-internal.la'
> make[1]: *** [Makefile:5436: tools/btpclient] Error 1
> ---
> Makefile.tools | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.tools b/Makefile.tools
> index 1f8271542..0f94bbbe7 100644
> --- a/Makefile.tools
> +++ b/Makefile.tools
> @@ -471,5 +471,5 @@ noinst_PROGRAMS += tools/btpclient
> tools_btpclient_SOURCES = tools/btpclient.c src/shared/btp.c src/shared/btp.h
> tools_btpclient_LDADD = lib/libbluetooth-internal.la \
> src/libshared-ell.la $(ell_ldadd)
> -tools_btpclient_DEPENDENCIES = $(ell_dependencies)
> +tools_btpclient_DEPENDENCIES = lib/libbluetooth-internal.la $(ell_dependencies)
> endif
> --
> 2.20.1

Applied.

--
Luiz Augusto von Dentz