projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee25f5c)
dash: fix static link with libedit
authorBaruch Siach <baruch@tkos.co.il>
Fri, 2 Mar 2018 05:22:36 +0000 (07:22 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 2 Mar 2018 06:59:27 +0000 (07:59 +0100)
libedit is an optional dependency of dash since commit 651af57cf011e
(dash: enable line editting if libedit is selected). Unfortunately, the
dash build system does not take into account the ncurses dependency of
libedit. Use pkgconf to get that right.

Fixes:
http://autobuild.buildroot.net/results/801/801e8bc06277978556a301ddf54f609169de37bb/
http://autobuild.buildroot.net/results/123/12367267735b9165afef77289460c247aaad494a/
http://autobuild.buildroot.net/results/aa7/aa7cc7315d778c15c5165ca6423257a84b957482/

Cc: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/dash/dash.mk patch | blob | history

diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 87c9cc9f8b87b9da7eb2454bab77496c809704e5..2ee292b8d3e7e8d262aad16c09c1c2e90fb2d71f 100644 (file)
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -10,8 +10,9 @@ DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
 DASH_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBEDIT),y)
-DASH_DEPENDENCIES += libedit
+DASH_DEPENDENCIES += libedit host-pkgconf
 DASH_CONF_OPTS += --with-libedit
+DASH_CONF_ENV += LIBS=`pkg-config --libs libedit`
 
 # Enable line editing, Emacs style
 define DASH_INSTALL_PROFILE