From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E3771382C5 for ; Thu, 21 May 2020 17:25:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3283CE0936; Thu, 21 May 2020 17:25:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B819E0936 for ; Thu, 21 May 2020 17:25:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EB1C34F0FF for ; Thu, 21 May 2020 17:25:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FD3524E for ; Thu, 21 May 2020 17:25:07 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1590081829.e6f652c1fd198fb98d807fec2d0aad21ab018252.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild X-VCS-Directories: dev-embedded/u-boot-tools/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: e6f652c1fd198fb98d807fec2d0aad21ab018252 X-VCS-Branch: master Date: Thu, 21 May 2020 17:25:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7454d7e8-a83e-45c5-b550-ed5c41ea3b8a X-Archives-Hash: 5bc2f99293753f8941609723fdd74ad5 commit: e6f652c1fd198fb98d807fec2d0aad21ab018252 Author: Mike Frysinger chromium org> AuthorDate: Thu May 21 17:21:50 2020 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu May 21 17:23:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f652c1 dev-embedded/u-boot-tools: avoid default gcc & pkg-config This doesn't fully fix cross-compiling, but gets us closer. Upstream does not support it, so our hackery cuts deep. Signed-off-by: Mike Frysinger gentoo.org> .../u-boot-tools/u-boot-tools-2020.04-r1.ebuild | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild index 480bbd0f2a4..32ca29504b4 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild @@ -22,13 +22,26 @@ BDEPEND=" S=${WORKDIR}/${MY_P} +src_prepare() { + default + sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \ + scripts/kconfig/lxdialog/check-lxdialog.sh \ + scripts/kconfig/Makefile \ + tools/Makefile || die +} + +src_configure() { + tc-export CC PKG_CONFIG +} + src_compile() { # Unset a few KBUILD variables. Bug #540476 unset KBUILD_OUTPUT KBUILD_SRC emake \ V=1 \ - HOSTCC="$(tc-getCC)" \ + CC="${CC}" \ + HOSTCC="${CC}" \ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \ HOSTLDFLAGS="${LDFLAGS}" \ tools-only_defconfig @@ -38,7 +51,8 @@ src_compile() { NO_SDL=1 \ HOSTSTRIP=: \ STRIP=: \ - HOSTCC="$(tc-getCC)" \ + CC="${CC}" \ + HOSTCC="${CC}" \ HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \ HOSTLDFLAGS="${LDFLAGS}" \ CONFIG_ENV_OVERWRITE=y \