From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Fri, 10 Feb 2017 18:59:54 +0000 (+0300)
Subject: toolchain/uclibc: Fix unmanned configuration with "V=s"
X-Git-Tag: v18.06.0-rc1~3700
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=eed6c85b7fbe35ac35df6d481510a239de456a68;p=openwrt%2Fstaging%2Fchunkeey.git

toolchain/uclibc: Fix unmanned configuration with "V=s"

Currently on attempt to configure uClibc with "V=s" user is prompted
to answer on configuration questions. Major inconvenience here is
build procedure get paused until user answers all questions.
That happens because not all symbols are defined in our .config.

Solution is as simple as usage of "olddefconfig" target instead of
simple "oldconfig". In that case default values get silently set
for symbols not defined by our .config explicitly.

We haven't noticed that subtle issue before because without "V=s"
what we do is "make oldconfig < /dev/null" which automatically
answers all questions :)

Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
---

diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index efcbde8f02..0e3f5600d6 100644
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -83,7 +83,7 @@ define Host/Configure
 		$(HOST_BUILD_DIR)/.config.new
 	cmp -s $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last || { \
 		cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config && \
-		$(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
+		$(MAKE) -C $(HOST_BUILD_DIR) olddefconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
 		$(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" && \
 		cp $(HOST_BUILD_DIR)/.config.new $(HOST_BUILD_DIR)/.config.last; \
 	}