Linux-Bluetooth Archive on lore.kernel.org
 help / Atom feed
* [PATCH 1/2] build: Fix missing dependency for btpclient
@ 2019-02-12 15:15 Szymon Janc
  2019-02-12 15:15 ` [PATCH 2/2] gitignore: Fix bluetooth-meshd name Szymon Janc
  2019-02-13 15:20 ` [PATCH 1/2] build: Fix missing dependency for btpclient Luiz Augusto von Dentz
  0 siblings, 2 replies; 3+ messages in thread
From: Szymon Janc @ 2019-02-12 15:15 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Szymon Janc

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] gitignore: Fix bluetooth-meshd name
  2019-02-12 15:15 [PATCH 1/2] build: Fix missing dependency for btpclient Szymon Janc
@ 2019-02-12 15:15 ` Szymon Janc
  2019-02-13 15:20 ` [PATCH 1/2] build: Fix missing dependency for btpclient Luiz Augusto von Dentz
  1 sibling, 0 replies; 3+ messages in thread
From: Szymon Janc @ 2019-02-12 15:15 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Szymon Janc

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/2] build: Fix missing dependency for btpclient
  2019-02-12 15:15 [PATCH 1/2] build: Fix missing dependency for btpclient Szymon Janc
  2019-02-12 15:15 ` [PATCH 2/2] gitignore: Fix bluetooth-meshd name Szymon Janc
@ 2019-02-13 15:20 ` Luiz Augusto von Dentz
  1 sibling, 0 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2019-02-13 15:20 UTC (permalink / raw)
  To: Szymon Janc; +Cc: linux-bluetooth

Hi Szymon,
On Tue, Feb 12, 2019 at 5:18 PM Szymon Janc <szymon.janc@codecoup.pl> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-12 15:15 [PATCH 1/2] build: Fix missing dependency for btpclient Szymon Janc
2019-02-12 15:15 ` [PATCH 2/2] gitignore: Fix bluetooth-meshd name Szymon Janc
2019-02-13 15:20 ` [PATCH 1/2] build: Fix missing dependency for btpclient Luiz Augusto von Dentz

Linux-Bluetooth Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-bluetooth/0 linux-bluetooth/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-bluetooth linux-bluetooth/ https://lore.kernel.org/linux-bluetooth \
		linux-bluetooth@vger.kernel.org linux-bluetooth@archiver.kernel.org
	public-inbox-index linux-bluetooth


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-bluetooth


AGPL code for this site: git clone https://public-inbox.org/ public-inbox