| From f37fa9a41f248fa41dd74a41c66cb41a291c03d2 Mon Sep 17 00:00:00 2001 |
| From: Andre McCurdy <armccurdy@gmail.com> |
| Date: Fri, 16 Sep 2016 12:18:23 -0700 |
| Subject: [PATCH] fix libtomcrypt/libtommath ordering |
| |
| 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. |
| |
| Upstream-Status: Backport [ https://github.com/mkj/dropbear/commit/f9e6bc2aecab0f4b5b529e07a92cc63c8a66cd4b ] |
| |
| Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| Signed-off-by: Dengke Du <dengke.du@windriver.com> |
| --- |
| configure.ac | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index 245408d..d624853 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom, |
| AC_MSG_NOTICE(Forcing bundled libtom*) |
| else |
| BUNDLED_LIBTOM=0 |
| - AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", |
| + AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", |
| [AC_MSG_ERROR([Missing system libtommath and --disable-bundled-libtom was specified])] ) |
| - AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt", |
| + AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", |
| [AC_MSG_ERROR([Missing system libtomcrypt and --disable-bundled-libtom was specified])] ) |
| fi |
| ], |
| [ |
| BUNDLED_LIBTOM=0 |
| - AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="$LIBTOM_LIBS -ltommath", BUNDLED_LIBTOM=1) |
| - AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="$LIBTOM_LIBS -ltomcrypt", BUNDLED_LIBTOM=1) |
| + AC_CHECK_LIB(tommath, mp_exptmod, LIBTOM_LIBS="-ltommath $LIBTOM_LIBS", BUNDLED_LIBTOM=1) |
| + AC_CHECK_LIB(tomcrypt, register_cipher, LIBTOM_LIBS="-ltomcrypt $LIBTOM_LIBS", BUNDLED_LIBTOM=1) |
| ] |
| ) |
| |
| -- |
| 2.8.1 |
| |