diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-11-14 00:53:35 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-11-14 12:34:49 +0100 |
| commit | b48e35a28a6391ec16f09df66ad5b1065330f265 (patch) | |
| tree | 83e955dab61ba5cca95707c2b7920e74ec99e2d0 /support/kconfig/Makefile | |
| parent | 147be50283c49ed15a6b56aaa5d455eec92c9615 (diff) | |
| download | buildroot-b48e35a28a6391ec16f09df66ad5b1065330f265.tar.gz buildroot-b48e35a28a6391ec16f09df66ad5b1065330f265.zip | |
support/kconfig: bump to kconfig from linux-3.12
With this, we can trash our probability patch, it's now upstream.
Refresh a few other patches.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/kconfig/Makefile')
| -rw-r--r-- | support/kconfig/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/support/kconfig/Makefile b/support/kconfig/Makefile index d28b7ac45c..7eb4071b4e 100644 --- a/support/kconfig/Makefile +++ b/support/kconfig/Makefile @@ -219,7 +219,9 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) -HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses +HOSTLOADLIBES_nconf = $(shell \ + pkg-config --libs menu panel ncurses 2>/dev/null \ + || echo "-lmenu -lpanel -lncurses" ) $(obj)/qconf.o: $(obj)/.tmp_qtcheck ifeq ($(qconf-target),1) |
