mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
8a97d9ef92
commit
8aad2302a6
@@ -0,0 +1,43 @@
|
|||||||
|
From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@knc.nu>
|
||||||
|
Date: Wed, 11 May 2016 12:35:06 +0200
|
||||||
|
Subject: [PATCH] Support out-of-tree builds usign bundled libtom
|
||||||
|
|
||||||
|
When building out-of-tree we need both source and generated
|
||||||
|
folders in include paths to find both distributed and generated
|
||||||
|
headers.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||||
|
Upstream-Status: Backport
|
||||||
|
---
|
||||||
|
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..7970700 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 -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/
|
||||||
|
|
||||||
|
# additional warnings (newer GCC 3.4 and higher)
|
||||||
|
ifdef GCC_34
|
||||||
|
diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in
|
||||||
|
index 06aba68..019c50b 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. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../
|
||||||
|
|
||||||
|
ifndef IGNORE_SPEED
|
||||||
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
require dropbear.inc
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "2ccc0a2f3e37ca221db12c5af6a88137"
|
|
||||||
SRC_URI[sha256sum] = "376214169c0e187ee9f48ae1a99b3f835016ad5b98ede4bfd1cf581deba783af"
|
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
require dropbear.inc
|
||||||
|
|
||||||
|
SRC_URI += "file://support-out-of-tree-builds.patch"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "8d6d78ce60ca52350ec04fcbd711ce9b"
|
||||||
|
SRC_URI[sha256sum] = "5c61a4f69b093b688629cd365be38701485ff63cfb23642dab7a05ad250aefd7"
|
||||||
|
|
||||||
Reference in New Issue
Block a user