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 486FA1382C5 for ; Mon, 21 Jun 2021 21:23:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2559E088B; Mon, 21 Jun 2021 21:23:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 79657E088B for ; Mon, 21 Jun 2021 21:23:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C7DC3340815 for ; Mon, 21 Jun 2021 21:23:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12D597B7 for ; Mon, 21 Jun 2021 21:23:24 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1624309456.b40ebcdb89f19d2fd0c563590f30d7574cfe0755.slyfox@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: /, wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev wrappers/emerge-wrapper X-VCS-Directories: wrappers/ / X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: b40ebcdb89f19d2fd0c563590f30d7574cfe0755 X-VCS-Branch: master Date: Mon, 21 Jun 2021 21:23:24 +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: d655ad5c-c13d-4d33-88a2-eb1939531780 X-Archives-Hash: c042bfce5edacd380d176ec96e4027c4 commit: b40ebcdb89f19d2fd0c563590f30d7574cfe0755 Author: David Seifert gentoo org> AuthorDate: Mon Jun 21 13:30:46 2021 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jun 21 21:04:16 2021 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=b40ebcdb crossdev, emerge-wrapper: request EAPI=7 on eclass imports Today ::gentoo dropped support for EAPI=0 from multilib.eclass and toolchain-funcs.eclass. Due to lack of error handling on crossdev side srossdev derived wrong environment for $CTARGET (and mostly fell back to CHOST). This caused at best failing early on gcc-stage1 build. At worst crossdev installed libraries into a wrong $(get_libdir), installed symlinks from wrong host and other disasters. Previous crossdev commits make crossdev crash earlier instead of generating wrong environment. This commit allows dropping EAI=0 support for eclasses eventually. Reported-by: Marco Scardovi (scardracs) Bug: https://bugs.gentoo.org/797367 Signed-off-by: Sergei Trofimovich gentoo.org> crossdev | 2 +- wrappers/emerge-wrapper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crossdev b/crossdev index 619603f..57ffbb5 100755 --- a/crossdev +++ b/crossdev @@ -983,7 +983,7 @@ load_multilib_env() { for p in ${SEARCH_OVERLAYS} ${MAIN_REPO_PATH} ; do p+="/eclass/multilib.eclass" if [[ -e ${p} ]] ; then - . "${p}" + EAPI=7 . "${p}" break fi done diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index d9ba08b..d8c6537 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -48,7 +48,7 @@ cross_wrap_etc() ARCH=$( inherit() { :; } die() { err "toolchain-funcs.eclass$*"; } - . "${MAIN_REPO_PATH}"/eclass/toolchain-funcs.eclass + EAPI=7 . "${MAIN_REPO_PATH}"/eclass/toolchain-funcs.eclass tc-arch ) [[ $? -ne 0 ]] && err "Failed calling 'tc-arch' from toolchain-funcs.eclass."