summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-09-16 15:29:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-20 15:11:08 +0100
commit472c245cfe7d6173eaa2359bab5952439d54eef0 (patch)
tree43494d2fe21f97ec1298a04aae28183b73ddb3f5
parent5637f8605f824fe69bf4b9af037388b99d9c9e6e (diff)
downloadpoky-472c245cfe7d6173eaa2359bab5952439d54eef0.tar.gz
dropbear: fix -ltomcrypt -ltommath order when using system libtom libs
To prevent build failures when using system libtom libraries and linking with --as-needed, LIBTOM_LIBS should be in the order -ltomcrypt -ltommath, not the other way around, ie libs should be prepended to LIBTOM_LIBS as they are found, not appended. Note that LIBTOM_LIBS is not used when linking with the bundled libtom libs. (From OE-Core rev: 62e96283fe77469e24e8df86c6c037c92009b00a) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc1
-rw-r--r--meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch48
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 923d31c307..cdac7ec99d 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -17,6 +17,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
17 file://0003-configure.patch \ 17 file://0003-configure.patch \
18 file://0004-fix-2kb-keys.patch \ 18 file://0004-fix-2kb-keys.patch \
19 file://0007-dropbear-fix-for-x32-abi.patch \ 19 file://0007-dropbear-fix-for-x32-abi.patch \
20 file://fix-libtomcrypt-libtommath-ordering.patch \
20 file://init \ 21 file://init \
21 file://dropbearkey.service \ 22 file://dropbearkey.service \
22 file://dropbear@.service \ 23 file://dropbear@.service \
diff --git a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
new file mode 100644
index 0000000000..de930f29d1
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
@@ -0,0 +1,48 @@
1From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Fri, 16 Sep 2016 12:18:23 -0700
4Subject: [PATCH] fix libtomcrypt/libtommath ordering
5
6To prevent build failures when using system libtom libraries and
7linking with --as-needed, LIBTOM_LIBS should be in the order
8-ltomcrypt -ltommath, not the other way around, ie libs should be
9prepended to LIBTOM_LIBS as they are found, not appended.
10
11Note that LIBTOM_LIBS is not used when linking with the bundled
12libtom libs.
13
14Upstream-Status: Pending
15
16Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
17---
18 configure.ac | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
22index b6abe4c..85bb8bc 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom,
26 AC_MSG_NOTICE(Forcing bundled libtom*)
27 else
28 BUNDLED_LIBTOM=0
29- AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath",
30+ AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS",
31 [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] )
32- AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt",
33+ AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS",
34 [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] )
35 fi
36 ],
37 [
38 BUNDLED_LIBTOM=0
39- AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", BUNDLED_LIBTOM=1)
40- AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt", BUNDLED_LIBTOM=1)
41+ AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
42+ AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1)
43 ]
44 )
45
46--
471.9.1
48