diff mbox

[LEDE-DEV,RFC,1/1] Revert "build: fix regression on running make kernel_menuconfig"

Message ID 20170514222027.12390-2-ryazanov.s.a@gmail.com
State Superseded
Headers show

Commit Message

Sergey Ryazanov May 14, 2017, 10:20 p.m. UTC
This reverts commit 86c966a8ae9c4e74b912a16a760aaed17c68eb32.

This patch caused the segmentation fault in mconf during
"make kernel_menuconfig" due to a mess with ncurses/ncursesw libraries
(forced linking with ncurses, while binary compiled with headers of
ncursesw).

Fixes: FS#366 (make kernel_menuconfig: Segmentation fault)

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
---
 include/kernel-build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stijn Tintel May 14, 2017, 11:53 p.m. UTC | #1
On 15-05-17 00:20, Sergey Ryazanov wrote:
> This reverts commit 86c966a8ae9c4e74b912a16a760aaed17c68eb32.
>
> This patch caused the segmentation fault in mconf during
> "make kernel_menuconfig" due to a mess with ncurses/ncursesw libraries
> (forced linking with ncurses, while binary compiled with headers of
> ncursesw).
>
> Fixes: FS#366 (make kernel_menuconfig: Segmentation fault)
>
> Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
> ---
>  include/kernel-build.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/kernel-build.mk b/include/kernel-build.mk
> index 7d1e23c..a4d12ec 100644
> --- a/include/kernel-build.mk
> +++ b/include/kernel-build.mk
> @@ -159,7 +159,7 @@ define BuildKernel
>  	rm -f $(LINUX_DIR)/.config.prev
>  	rm -f $(STAMP_CONFIGURED)
>  	$(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
> -	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib -lncurses" $$@
> +	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
>  	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)
>  
>    install: $(LINUX_DIR)/.image

This fixes FS #366 for me. Thanks a lot!

Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Sergey Ryazanov May 15, 2017, 12:55 a.m. UTC | #2
On Mon, May 15, 2017 at 2:53 AM, Stijn Tintel <stijn@linux-ipv6.be> wrote:
> On 15-05-17 00:20, Sergey Ryazanov wrote:
>> This reverts commit 86c966a8ae9c4e74b912a16a760aaed17c68eb32.
>>
>> This patch caused the segmentation fault in mconf during
>> "make kernel_menuconfig" due to a mess with ncurses/ncursesw libraries
>> (forced linking with ncurses, while binary compiled with headers of
>> ncursesw).
>>
>> Fixes: FS#366 (make kernel_menuconfig: Segmentation fault)
>>
> This fixes FS #366 for me. Thanks a lot!
>
> Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
>

Thank you for so fast testing!
Sergey Ryazanov May 27, 2017, 11:37 a.m. UTC | #3
On Mon, May 15, 2017 at 1:20 AM, Sergey Ryazanov <ryazanov.s.a@gmail.com> wrote:
> This reverts commit 86c966a8ae9c4e74b912a16a760aaed17c68eb32.
>
> This patch caused the segmentation fault in mconf during
> "make kernel_menuconfig" due to a mess with ncurses/ncursesw libraries
> (forced linking with ncurses, while binary compiled with headers of
> ncursesw).
>
> Fixes: FS#366 (make kernel_menuconfig: Segmentation fault)
>

Any comments on this change? Should I resend it as regular patch?
diff mbox

Patch

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 7d1e23c..a4d12ec 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -159,7 +159,7 @@  define BuildKernel
 	rm -f $(LINUX_DIR)/.config.prev
 	rm -f $(STAMP_CONFIGURED)
 	$(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
-	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib -lncurses" $$@
+	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
 	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)
 
   install: $(LINUX_DIR)/.image