From patchwork Sun Jun 24 14:12:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 933920 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GLGP0ztM"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41DDm44Kx5z9s19 for ; Mon, 25 Jun 2018 00:12:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB39F86C25; Sun, 24 Jun 2018 14:12:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RWp_W2BeRaAf; Sun, 24 Jun 2018 14:12:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 17821863C9; Sun, 24 Jun 2018 14:12:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 92D151C097A for ; Sun, 24 Jun 2018 14:12:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 906FD863C9 for ; Sun, 24 Jun 2018 14:12:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q1yWm7LbP8TG for ; Sun, 24 Jun 2018 14:12:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A767C86371 for ; Sun, 24 Jun 2018 14:12:46 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id m15-v6so1599447edr.7 for ; Sun, 24 Jun 2018 07:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=RyWB3cQEAp4EbLZOPSlgxZqWoRHIG13iNAKWFqKWbXA=; b=GLGP0ztMhG3FAv723eVTbSWqMfcpbu+36JzhWzANzE8n2V1Q0xk9zVjBkawE2lWruW gtPaC0tX43aMKFryKBEUBUY8V/XJdKtprybWf1nd9UeZ4GnRkWrpRIYsCdDL3CYITLSL N1NKhz8y2FaAMvhhl1CzUoBQeMAvueiSB4tbLUGDSf5PP/Q86yc/kGyvyHDHLLWtw7fQ 9LNFJD+258PhqJimUqH7CUIpdBLMo/szKBpsue0KbrEP45nNP572Fc2vZtz+BqG38+tk T3AW0F10b7WlDZD+b7KcYPXUvlLBJpXn/cSROKHwPLK/XjZEgCfP1FkLqTGxFvjcOUlM xXHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=RyWB3cQEAp4EbLZOPSlgxZqWoRHIG13iNAKWFqKWbXA=; b=qZAYO3MbRfQ7a07kEQ/mhWJzfF7f5zRhVtXEMSQIGbZTNE3vltoon34pGtBg/w1vwM Ss3PakcPdvMc9Uzx54L4v/7tNXeacPb1bh2vcdMXPKZBaQM5BhhdlEe3fU93NPHBhyxi /dcA3z+xHiZrzoIuX9MMgGb1ynXg7zGsRI7O7IJv3+bRUd1I3LStQmufQwsk8ulz3JZk Y1zPYY0uBWL/0Npr9po1qEMPu9LiANDka1nbzh9L6QmDXZ76hr8dHq/Jk2BE+9HoKfVD nqb1AhnxyOWangEEZscwRIpwBlJOSm65/uTFXjHV1qDw6EMCpzYmHIWZC/QcYppPGwfk fz/A== X-Gm-Message-State: APt69E1QXTbQxUC5ngq8CuXIeCS6u09+R4VF4gwotJyLBbnVrt0786LP JSmm5sGwq5s8/X3TVW2nhyvTp18V X-Google-Smtp-Source: ADUXVKK2ViM3F7QbzeaKwLUDg5qbt2ulaURYWvc0IxkRDYcHm4tmu+lcpO00npM4utoJnuL8Pl6huQ== X-Received: by 2002:a50:8810:: with SMTP id b16-v6mr8452408edb.274.1529849564638; Sun, 24 Jun 2018 07:12:44 -0700 (PDT) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id j16-v6sm5916928edp.22.2018.06.24.07.12.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Jun 2018 07:12:43 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1fX5kw-0004OX-VH; Sun, 24 Jun 2018 16:12:42 +0200 From: Peter Korsgaard To: buildroot@buildroot.org, arnout@mind.be Date: Sun, 24 Jun 2018 16:12:42 +0200 Message-Id: <20180624141242.16851-1-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH] uboot: don't override HOSTCC/HOSTLDFLAGS for kconfig X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" So the host ncurses includes and library are used instead of a mix of both, causing corrupted characters. Similar to the linux fix in commit 6d3d09e23213e8 (linux: don't override HOSTCC for kconfig), except that we pass the linker flags in HOSTLDFLAGS. Signed-off-by: Peter Korsgaard Acked-by: Jagan Teki --- boot/uboot/uboot.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 03bd7ea743..6ef275e842 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -211,7 +211,15 @@ endif # BR2_TARGET_UBOOT_USE_DEFCONFIG UBOOT_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES)) UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig -UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) + +# UBOOT_MAKE_OPTS overrides HOSTCC / HOSTLDFLAGS to allow the build to +# find our host-openssl. However, this triggers a bug in the kconfig +# build script that causes it to build with /usr/include/ncurses.h +# (which is typically wchar) but link with +# $(HOST_DIR)/lib/libncurses.so (which is not). We don't actually +# need any host-package for kconfig, so remove the HOSTCC/HOSTLDFLAGS +# override again. +UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC)" HOSTLDFLAGS="" define UBOOT_HELP_CMDS @echo ' uboot-menuconfig - Run U-Boot menuconfig' @echo ' uboot-savedefconfig - Run U-Boot savedefconfig'