diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-23 15:44:05 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-25 07:50:17 +0100 |
commit | 8aad2302a634c8229df2e9907aff8deb4d9a6853 (patch) | |
tree | 38b0bcba45013547be6457ba0598ced048e3dcea /meta/recipes-core/dropbear/dropbear | |
parent | 8a97d9ef923355956ec08be0aff9428a1573884d (diff) | |
download | poky-8aad2302a634c8229df2e9907aff8deb4d9a6853.tar.gz |
dropbear: Upgrade 2015.71 -> 2016.73
Backport a patch to fix out-of-tree build.
(From OE-Core rev: b1613c946d1d6e5d7f5964e4d24f1d3146dfe39e)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch b/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch new file mode 100644 index 0000000000..df6efb4534 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@knc.nu> | ||
2 | Date: Wed, 11 May 2016 12:35:06 +0200 | ||
3 | Subject: [PATCH] Support out-of-tree builds usign bundled libtom | ||
4 | |||
5 | When building out-of-tree we need both source and generated | ||
6 | folders in include paths to find both distributed and generated | ||
7 | headers. | ||
8 | |||
9 | |||
10 | |||
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
12 | Upstream-Status: Backport | ||
13 | --- | ||
14 | libtomcrypt/Makefile.in | 2 +- | ||
15 | libtommath/Makefile.in | 2 +- | ||
16 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in | ||
19 | index 3056ef0..7970700 100644 | ||
20 | --- a/libtomcrypt/Makefile.in | ||
21 | +++ b/libtomcrypt/Makefile.in | ||
22 | @@ -19,7 +19,7 @@ srcdir=@srcdir@ | ||
23 | |||
24 | # Compilation flags. Note the += does not write over the user's CFLAGS! | ||
25 | # The rest of the flags come from the parent Dropbear makefile | ||
26 | -CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/ | ||
27 | +CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/ | ||
28 | |||
29 | # additional warnings (newer GCC 3.4 and higher) | ||
30 | ifdef GCC_34 | ||
31 | diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in | ||
32 | index 06aba68..019c50b 100644 | ||
33 | --- a/libtommath/Makefile.in | ||
34 | +++ b/libtommath/Makefile.in | ||
35 | @@ -9,7 +9,7 @@ VPATH=@srcdir@ | ||
36 | srcdir=@srcdir@ | ||
37 | |||
38 | # So that libtommath can include Dropbear headers for options and m_burn() | ||
39 | -CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../ | ||
40 | +CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../ | ||
41 | |||
42 | ifndef IGNORE_SPEED | ||
43 | |||