Import buildroot 2016.02.01
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
From 62ede7482da15d276b880f6d8540dce400dc50a7 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 26 Nov 2015 15:59:07 +0100
|
||||
Subject: [PATCH] configure: fix static linking with readline
|
||||
|
||||
When static linking is used, the order of the libraries is important,
|
||||
and the libraries using a symbol from another library should be listed
|
||||
*before* the library providing that symbol (see
|
||||
http://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking)
|
||||
for details.
|
||||
|
||||
When vtysh is linked statically, the command line contains "-lcurses
|
||||
-lreadline", which causes a build failure due to unresolved
|
||||
symbols. This is because readline is using symbols from the curses
|
||||
library: the order should be the opposite.
|
||||
|
||||
This patch fixes that problem by putting the -lreadline at the
|
||||
beginning of the LIBREADLINE variable calcualted by the configure
|
||||
script.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3003e62..290953d 100755
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -652,7 +652,7 @@ dnl [TODO] on Linux, and in [TODO] on Solaris.
|
||||
)]
|
||||
)]
|
||||
)
|
||||
- AC_CHECK_LIB(readline, main, LIBREADLINE="$LIBREADLINE -lreadline",,
|
||||
+ AC_CHECK_LIB(readline, main, LIBREADLINE="-lreadline $LIBREADLINE",,
|
||||
"$LIBREADLINE")
|
||||
if test $ac_cv_lib_readline_main = no; then
|
||||
AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.])
|
||||
--
|
||||
2.6.3
|
||||
|
||||
Reference in New Issue
Block a user