[PATCH] dropbear: support out-of-tree builds

[Matt Johnston]

Hi Peter,

Thank you for the patch. I think this should be solved in the hg tree but it didn't make it into the 2016.74 release.

https://github.com/mkj/dropbear/commit/3aeb55719633108471564b6780fe735c897a368a <https://github.com/mkj/dropbear/commit/3aeb55719633108471564b6780fe735c897a368a>

I'll see if I can get a release sorted out in the next few weeks. 
Current hg/git head has some large changes to options.h handling which haven't been tested much.
I may make a smaller cherry picked release first with accumulated patches, with a separate release for options.h changes.

Cheers,
Matt

> On Tue 9/5/2017, at 8:34 pm, Peter Krefting <peter at softwolves.pp.se> wrote:
> 
> Fixes issues with libtomcrypt and libtommath not finding config.h when
> building out-of-tree.
> 
> ---
> libtomcrypt/Makefile.in | 2 +-
> libtommath/Makefile.in  | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in
> index 3056ef0..40dea1a 100644
> --- a/libtomcrypt/Makefile.in
> +++ b/libtomcrypt/Makefile.in
> @@ -19,7 +19,7 @@ srcdir=@srcdir@
> 
> # Compilation flags. Note the += does not write over the user's CFLAGS!
> # The rest of the flags come from the parent Dropbear makefile
> -CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/
> +CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/ -I../
> 
> # additional warnings (newer GCC 3.4 and higher)
> ifdef GCC_34
> diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in
> index 06aba68..f6e34c2 100644
> --- a/libtommath/Makefile.in
> +++ b/libtommath/Makefile.in
> @@ -9,7 +9,7 @@ VPATH=@srcdir@
> srcdir=@srcdir@
> 
> # So that libtommath can include Dropbear headers for options and m_burn()
> -CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../
> +CFLAGS += -I$(srcdir)/ -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../ -I../
> 
> ifndef IGNORE_SPEED
> 
> -- 
> 2.12.0

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/attachments/20170510/31cc3894/attachment.htm